From e7a25b9db14361ba4464b07ac60bb76cef240644 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Fri, 26 Aug 2011 00:00:04 -0500
Subject: [PATCH] Adding easymotion and updating vimrc

---
 .gitmodules           |  3 +++
 vim/bundle/easymotion |  1 +
 vimrc                 | 13 ++++++-------
 3 files changed, 10 insertions(+), 7 deletions(-)
 create mode 160000 vim/bundle/easymotion

diff --git a/.gitmodules b/.gitmodules
index c9594e5..47d6b98 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,6 @@
 [submodule "vim/bundle/snipmate-snippets"]
 	path = vim/bundle/snipmate-snippets
 	url = git://github.com/honza/snipmate-snippets.git
+[submodule "vim/bundle/easymotion"]
+	path = vim/bundle/easymotion
+	url = git://github.com/Lokaltog/vim-easymotion
diff --git a/vim/bundle/easymotion b/vim/bundle/easymotion
new file mode 160000
index 0000000..cdecdc5
--- /dev/null
+++ b/vim/bundle/easymotion
@@ -0,0 +1 @@
+Subproject commit cdecdc56f938840cad250aecd58c1901f04c4d1b
diff --git a/vimrc b/vimrc
index 8274cc9..5a5590a 100644
--- a/vimrc
+++ b/vimrc
@@ -12,21 +12,18 @@ set noswapfile
 set undodir=~/.vim/undodir
 set undofile
 
-" filetype and plugin indentation
+" indentation
 filetype plugin on
 filetype indent on
+set autoindent
+set smartindent
 
 " search
 set hlsearch
 set incsearch
 set showmatch
 
-syntax enable
-
-set autoindent
-set smartindent
-
-" tabs
+" tab stops
 set expandtab
 set smarttab
 set tabstop=4
@@ -39,6 +36,8 @@ set nohls
 
 au BufNewFile,BufRead *.less set filetype=less
 
+syntax enable
+
 " solarized colors
 set background=dark
 let g:solarized_termtrans=1