diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f1fa4a6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "vim/bundle/fugitive"]
+	path = vim/bundle/fugitive
+	url = git://github.com/tpope/vim-fugitive.git
+[submodule "vim/bundle/delimitMate"]
+	path = vim/bundle/delimitMate
+	url = git://github.com/Raimondi/delimitMate.git
diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
new file mode 100644
index 0000000..dbf3cc2
--- /dev/null
+++ b/vim/autoload/pathogen.vim
@@ -0,0 +1,230 @@
+" pathogen.vim - path option manipulation
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      2.0
+
+" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
+"
+" For management of individually installed plugins in ~/.vim/bundle (or
+" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc
+" prior to `fileype plugin indent on` is the only other setup necessary.
+"
+" The API is documented inline below.  For maximum ease of reading,
+" :set foldmethod=marker
+
+if exists("g:loaded_pathogen") || &cp
+  finish
+endif
+let g:loaded_pathogen = 1
+
+" Point of entry for basic default usage.  Give a directory name to invoke
+" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path
+" to invoke pathogen#runtime_prepend_subdirectories().  Afterwards,
+" pathogen#cycle_filetype() is invoked.
+function! pathogen#infect(...) abort " {{{1
+  let source_path = a:0 ? a:1 : 'bundle'
+  if source_path =~# '[\\/]'
+    call pathogen#runtime_prepend_subdirectories(source_path)
+  else
+    call pathogen#runtime_append_all_bundles(source_path)
+  endif
+  call pathogen#cycle_filetype()
+endfunction " }}}1
+
+" Split a path into a list.
+function! pathogen#split(path) abort " {{{1
+  if type(a:path) == type([]) | return a:path | endif
+  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
+  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
+endfunction " }}}1
+
+" Convert a list to a path.
+function! pathogen#join(...) abort " {{{1
+  if type(a:1) == type(1) && a:1
+    let i = 1
+    let space = ' '
+  else
+    let i = 0
+    let space = ''
+  endif
+  let path = ""
+  while i < a:0
+    if type(a:000[i]) == type([])
+      let list = a:000[i]
+      let j = 0
+      while j < len(list)
+        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
+        let path .= ',' . escaped
+        let j += 1
+      endwhile
+    else
+      let path .= "," . a:000[i]
+    endif
+    let i += 1
+  endwhile
+  return substitute(path,'^,','','')
+endfunction " }}}1
+
+" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
+function! pathogen#legacyjoin(...) abort " {{{1
+  return call('pathogen#join',[1] + a:000)
+endfunction " }}}1
+
+" Remove duplicates from a list.
+function! pathogen#uniq(list) abort " {{{1
+  let i = 0
+  let seen = {}
+  while i < len(a:list)
+    if has_key(seen,a:list[i])
+      call remove(a:list,i)
+    else
+      let seen[a:list[i]] = 1
+      let i += 1
+    endif
+  endwhile
+  return a:list
+endfunction " }}}1
+
+" \ on Windows unless shellslash is set, / everywhere else.
+function! pathogen#separator() abort " {{{1
+  return !exists("+shellslash") || &shellslash ? '/' : '\'
+endfunction " }}}1
+
+" Convenience wrapper around glob() which returns a list.
+function! pathogen#glob(pattern) abort " {{{1
+  let files = split(glob(a:pattern),"\n")
+  return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
+endfunction "}}}1
+
+" Like pathogen#glob(), only limit the results to directories.
+function! pathogen#glob_directories(pattern) abort " {{{1
+  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
+endfunction "}}}1
+
+" Turn filetype detection off and back on again if it was already enabled.
+function! pathogen#cycle_filetype() " {{{1
+  if exists('g:did_load_filetypes')
+    filetype off
+    filetype on
+  endif
+endfunction " }}}1
+
+" Checks if a bundle is 'disabled'. A bundle is considered 'disabled' if
+" its 'basename()' is included in g:pathogen_disabled[]' or ends in a tilde.
+function! pathogen#is_disabled(path) " {{{1
+  if a:path =~# '\~$'
+    return 1
+  elseif !exists("g:pathogen_disabled")
+    return 0
+  endif
+  let sep = pathogen#separator()
+  return index(g:pathogen_disabled, strpart(a:path, strridx(a:path, sep)+1)) != -1
+endfunction "}}}1
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories.
+function! pathogen#runtime_prepend_subdirectories(path) " {{{1
+  let sep    = pathogen#separator()
+  let before = filter(pathogen#glob_directories(a:path.sep."*"), '!pathogen#is_disabled(v:val)')
+  let after  = filter(pathogen#glob_directories(a:path.sep."*".sep."after"), '!pathogen#is_disabled(v:val[0:-7])')
+  let rtp = pathogen#split(&rtp)
+  let path = expand(a:path)
+  call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
+  let &rtp = pathogen#join(pathogen#uniq(before + rtp + after))
+  return &rtp
+endfunction " }}}1
+
+" For each directory in rtp, check for a subdirectory named dir.  If it
+" exists, add all subdirectories of that subdirectory to the rtp, immediately
+" after the original directory.  If no argument is given, 'bundle' is used.
+" Repeated calls with the same arguments are ignored.
+function! pathogen#runtime_append_all_bundles(...) " {{{1
+  let sep = pathogen#separator()
+  let name = a:0 ? a:1 : 'bundle'
+  if "\n".s:done_bundles =~# "\\M\n".name."\n"
+    return ""
+  endif
+  let s:done_bundles .= name . "\n"
+  let list = []
+  for dir in pathogen#split(&rtp)
+    if dir =~# '\<after$'
+      let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
+    else
+      let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name.sep.'*[^~]'), '!pathogen#is_disabled(v:val)')
+    endif
+  endfor
+  let &rtp = pathogen#join(pathogen#uniq(list))
+  return 1
+endfunction
+
+let s:done_bundles = ''
+" }}}1
+
+" Invoke :helptags on all non-$VIM doc directories in runtimepath.
+function! pathogen#helptags() " {{{1
+  let sep = pathogen#separator()
+  for dir in pathogen#split(&rtp)
+    if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(glob(dir.sep.'doc'.sep.'*')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
+      helptags `=dir.'/doc'`
+    endif
+  endfor
+endfunction " }}}1
+
+command! -bar Helptags :call pathogen#helptags()
+
+" Like findfile(), but hardcoded to use the runtimepath.
+function! pathogen#runtime_findfile(file,count) "{{{1
+  let rtp = pathogen#join(1,pathogen#split(&rtp))
+  return fnamemodify(findfile(a:file,rtp,a:count),':p')
+endfunction " }}}1
+
+function! s:find(count,cmd,file,lcd) " {{{1
+  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
+  let file = pathogen#runtime_findfile(a:file,a:count)
+  if file ==# ''
+    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
+  elseif a:lcd
+    let path = file[0:-strlen(a:file)-2]
+    execute 'lcd `=path`'
+    return a:cmd.' '.fnameescape(a:file)
+  else
+    return a:cmd.' '.fnameescape(file)
+  endif
+endfunction " }}}1
+
+function! s:Findcomplete(A,L,P) " {{{1
+  let sep = pathogen#separator()
+  let cheats = {
+        \'a': 'autoload',
+        \'d': 'doc',
+        \'f': 'ftplugin',
+        \'i': 'indent',
+        \'p': 'plugin',
+        \'s': 'syntax'}
+  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
+    let request = cheats[a:A[0]].a:A[1:-1]
+  else
+    let request = a:A
+  endif
+  let pattern = substitute(request,'\'.sep,'*'.sep,'g').'*'
+  let found = {}
+  for path in pathogen#split(&runtimepath)
+    let matches = split(glob(path.sep.pattern),"\n")
+    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
+    call map(matches,'v:val[strlen(path)+1:-1]')
+    for match in matches
+      let found[match] = 1
+    endfor
+  endfor
+  return sort(keys(found))
+endfunction " }}}1
+
+command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
+command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
+command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
+command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
+command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
+command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
+
+" vim:set ft=vim ts=8 sw=2 sts=2:
diff --git a/vim/bundle/delimitMate b/vim/bundle/delimitMate
new file mode 160000
index 0000000..39b8298
--- /dev/null
+++ b/vim/bundle/delimitMate
@@ -0,0 +1 @@
+Subproject commit 39b8298390a9171c796df077ad3c5f3c0f111c56
diff --git a/vim/bundle/fugitive b/vim/bundle/fugitive
new file mode 160000
index 0000000..5f5c8da
--- /dev/null
+++ b/vim/bundle/fugitive
@@ -0,0 +1 @@
+Subproject commit 5f5c8da61fd817ba8dc091350b51c1ab7ca53c8d
diff --git a/vim/.netrwhist b/vim_old/.netrwhist
similarity index 100%
rename from vim/.netrwhist
rename to vim_old/.netrwhist
diff --git a/vim/after/plugin/snipMate.vim b/vim_old/after/plugin/snipMate.vim
similarity index 100%
rename from vim/after/plugin/snipMate.vim
rename to vim_old/after/plugin/snipMate.vim
diff --git a/vim/autoload/acp.vim b/vim_old/autoload/acp.vim
similarity index 100%
rename from vim/autoload/acp.vim
rename to vim_old/autoload/acp.vim
diff --git a/vim/autoload/snipMate.vim b/vim_old/autoload/snipMate.vim
similarity index 100%
rename from vim/autoload/snipMate.vim
rename to vim_old/autoload/snipMate.vim
diff --git a/vim/c-support/codesnippets/Makefile b/vim_old/c-support/codesnippets/Makefile
similarity index 100%
rename from vim/c-support/codesnippets/Makefile
rename to vim_old/c-support/codesnippets/Makefile
diff --git a/vim/c-support/codesnippets/Makefile.multi-target.template b/vim_old/c-support/codesnippets/Makefile.multi-target.template
similarity index 100%
rename from vim/c-support/codesnippets/Makefile.multi-target.template
rename to vim_old/c-support/codesnippets/Makefile.multi-target.template
diff --git a/vim/c-support/codesnippets/calloc_double_matrix.c b/vim_old/c-support/codesnippets/calloc_double_matrix.c
similarity index 100%
rename from vim/c-support/codesnippets/calloc_double_matrix.c
rename to vim_old/c-support/codesnippets/calloc_double_matrix.c
diff --git a/vim/c-support/codesnippets/calloc_int_matrix.c b/vim_old/c-support/codesnippets/calloc_int_matrix.c
similarity index 100%
rename from vim/c-support/codesnippets/calloc_int_matrix.c
rename to vim_old/c-support/codesnippets/calloc_int_matrix.c
diff --git a/vim/c-support/codesnippets/main.c b/vim_old/c-support/codesnippets/main.c
similarity index 100%
rename from vim/c-support/codesnippets/main.c
rename to vim_old/c-support/codesnippets/main.c
diff --git a/vim/c-support/codesnippets/main.cc b/vim_old/c-support/codesnippets/main.cc
similarity index 100%
rename from vim/c-support/codesnippets/main.cc
rename to vim_old/c-support/codesnippets/main.cc
diff --git a/vim/c-support/codesnippets/print_array.cc.noindent b/vim_old/c-support/codesnippets/print_array.cc.noindent
similarity index 100%
rename from vim/c-support/codesnippets/print_array.cc.noindent
rename to vim_old/c-support/codesnippets/print_array.cc.noindent
diff --git a/vim/c-support/codesnippets/print_double_array.c.noindent b/vim_old/c-support/codesnippets/print_double_array.c.noindent
similarity index 100%
rename from vim/c-support/codesnippets/print_double_array.c.noindent
rename to vim_old/c-support/codesnippets/print_double_array.c.noindent
diff --git a/vim/c-support/codesnippets/print_int_array.c.noindent b/vim_old/c-support/codesnippets/print_int_array.c.noindent
similarity index 100%
rename from vim/c-support/codesnippets/print_int_array.c.noindent
rename to vim_old/c-support/codesnippets/print_int_array.c.noindent
diff --git a/vim/c-support/doc/ChangeLog b/vim_old/c-support/doc/ChangeLog
similarity index 100%
rename from vim/c-support/doc/ChangeLog
rename to vim_old/c-support/doc/ChangeLog
diff --git a/vim/c-support/doc/c-hotkeys.pdf b/vim_old/c-support/doc/c-hotkeys.pdf
similarity index 100%
rename from vim/c-support/doc/c-hotkeys.pdf
rename to vim_old/c-support/doc/c-hotkeys.pdf
diff --git a/vim/c-support/doc/c-hotkeys.tex b/vim_old/c-support/doc/c-hotkeys.tex
similarity index 100%
rename from vim/c-support/doc/c-hotkeys.tex
rename to vim_old/c-support/doc/c-hotkeys.tex
diff --git a/vim/c-support/rc/customization.ctags b/vim_old/c-support/rc/customization.ctags
similarity index 100%
rename from vim/c-support/rc/customization.ctags
rename to vim_old/c-support/rc/customization.ctags
diff --git a/vim/c-support/rc/customization.gvimrc b/vim_old/c-support/rc/customization.gvimrc
similarity index 100%
rename from vim/c-support/rc/customization.gvimrc
rename to vim_old/c-support/rc/customization.gvimrc
diff --git a/vim/c-support/rc/customization.indent.pro b/vim_old/c-support/rc/customization.indent.pro
similarity index 100%
rename from vim/c-support/rc/customization.indent.pro
rename to vim_old/c-support/rc/customization.indent.pro
diff --git a/vim/c-support/rc/customization.vimrc b/vim_old/c-support/rc/customization.vimrc
similarity index 100%
rename from vim/c-support/rc/customization.vimrc
rename to vim_old/c-support/rc/customization.vimrc
diff --git a/vim/c-support/scripts/wrapper.sh b/vim_old/c-support/scripts/wrapper.sh
similarity index 100%
rename from vim/c-support/scripts/wrapper.sh
rename to vim_old/c-support/scripts/wrapper.sh
diff --git a/vim/c-support/templates/Templates b/vim_old/c-support/templates/Templates
similarity index 100%
rename from vim/c-support/templates/Templates
rename to vim_old/c-support/templates/Templates
diff --git a/vim/c-support/templates/c.comments.template b/vim_old/c-support/templates/c.comments.template
similarity index 100%
rename from vim/c-support/templates/c.comments.template
rename to vim_old/c-support/templates/c.comments.template
diff --git a/vim/c-support/templates/c.cpp.template b/vim_old/c-support/templates/c.cpp.template
similarity index 100%
rename from vim/c-support/templates/c.cpp.template
rename to vim_old/c-support/templates/c.cpp.template
diff --git a/vim/c-support/templates/c.idioms.template b/vim_old/c-support/templates/c.idioms.template
similarity index 100%
rename from vim/c-support/templates/c.idioms.template
rename to vim_old/c-support/templates/c.idioms.template
diff --git a/vim/c-support/templates/c.preprocessor.template b/vim_old/c-support/templates/c.preprocessor.template
similarity index 100%
rename from vim/c-support/templates/c.preprocessor.template
rename to vim_old/c-support/templates/c.preprocessor.template
diff --git a/vim/c-support/templates/c.statements.template b/vim_old/c-support/templates/c.statements.template
similarity index 100%
rename from vim/c-support/templates/c.statements.template
rename to vim_old/c-support/templates/c.statements.template
diff --git a/vim/c-support/templates/cpp.comments.template b/vim_old/c-support/templates/cpp.comments.template
similarity index 100%
rename from vim/c-support/templates/cpp.comments.template
rename to vim_old/c-support/templates/cpp.comments.template
diff --git a/vim/c-support/templates/cpp.cpp.template b/vim_old/c-support/templates/cpp.cpp.template
similarity index 100%
rename from vim/c-support/templates/cpp.cpp.template
rename to vim_old/c-support/templates/cpp.cpp.template
diff --git a/vim/c-support/templates/cpp.idioms.template b/vim_old/c-support/templates/cpp.idioms.template
similarity index 100%
rename from vim/c-support/templates/cpp.idioms.template
rename to vim_old/c-support/templates/cpp.idioms.template
diff --git a/vim/c-support/templates/cpp.preprocessor.template b/vim_old/c-support/templates/cpp.preprocessor.template
similarity index 100%
rename from vim/c-support/templates/cpp.preprocessor.template
rename to vim_old/c-support/templates/cpp.preprocessor.template
diff --git a/vim/c-support/templates/cpp.statements.template b/vim_old/c-support/templates/cpp.statements.template
similarity index 100%
rename from vim/c-support/templates/cpp.statements.template
rename to vim_old/c-support/templates/cpp.statements.template
diff --git a/vim/c-support/wordlists/c-c++-keywords.list b/vim_old/c-support/wordlists/c-c++-keywords.list
similarity index 100%
rename from vim/c-support/wordlists/c-c++-keywords.list
rename to vim_old/c-support/wordlists/c-c++-keywords.list
diff --git a/vim/c-support/wordlists/k+r.list b/vim_old/c-support/wordlists/k+r.list
similarity index 100%
rename from vim/c-support/wordlists/k+r.list
rename to vim_old/c-support/wordlists/k+r.list
diff --git a/vim/c-support/wordlists/stl_index.list b/vim_old/c-support/wordlists/stl_index.list
similarity index 100%
rename from vim/c-support/wordlists/stl_index.list
rename to vim_old/c-support/wordlists/stl_index.list
diff --git a/vim/doc/acp.jax b/vim_old/doc/acp.jax
similarity index 100%
rename from vim/doc/acp.jax
rename to vim_old/doc/acp.jax
diff --git a/vim/doc/acp.txt b/vim_old/doc/acp.txt
similarity index 100%
rename from vim/doc/acp.txt
rename to vim_old/doc/acp.txt
diff --git a/vim/doc/csupport.txt b/vim_old/doc/csupport.txt
similarity index 100%
rename from vim/doc/csupport.txt
rename to vim_old/doc/csupport.txt
diff --git a/vim/doc/snipMate.txt b/vim_old/doc/snipMate.txt
similarity index 100%
rename from vim/doc/snipMate.txt
rename to vim_old/doc/snipMate.txt
diff --git a/vim/doc/taglist.txt b/vim_old/doc/taglist.txt
similarity index 100%
rename from vim/doc/taglist.txt
rename to vim_old/doc/taglist.txt
diff --git a/vim/doc/tags b/vim_old/doc/tags
similarity index 100%
rename from vim/doc/tags
rename to vim_old/doc/tags
diff --git a/vim/ftdetect/jade.vim b/vim_old/ftdetect/jade.vim
similarity index 100%
rename from vim/ftdetect/jade.vim
rename to vim_old/ftdetect/jade.vim
diff --git a/vim/ftplugin/c.vim b/vim_old/ftplugin/c.vim
similarity index 100%
rename from vim/ftplugin/c.vim
rename to vim_old/ftplugin/c.vim
diff --git a/vim/ftplugin/html_snip_helper.vim b/vim_old/ftplugin/html_snip_helper.vim
similarity index 100%
rename from vim/ftplugin/html_snip_helper.vim
rename to vim_old/ftplugin/html_snip_helper.vim
diff --git a/vim/ftplugin/jade.vim b/vim_old/ftplugin/jade.vim
similarity index 100%
rename from vim/ftplugin/jade.vim
rename to vim_old/ftplugin/jade.vim
diff --git a/vim/indent/jade.vim b/vim_old/indent/jade.vim
similarity index 100%
rename from vim/indent/jade.vim
rename to vim_old/indent/jade.vim
diff --git a/vim/indent/php.vim b/vim_old/indent/php.vim
similarity index 100%
rename from vim/indent/php.vim
rename to vim_old/indent/php.vim
diff --git a/vim/plugin/acp.vim b/vim_old/plugin/acp.vim
similarity index 100%
rename from vim/plugin/acp.vim
rename to vim_old/plugin/acp.vim
diff --git a/vim/plugin/c.vim b/vim_old/plugin/c.vim
similarity index 100%
rename from vim/plugin/c.vim
rename to vim_old/plugin/c.vim
diff --git a/vim/plugin/snipMate.vim b/vim_old/plugin/snipMate.vim
similarity index 100%
rename from vim/plugin/snipMate.vim
rename to vim_old/plugin/snipMate.vim
diff --git a/vim/plugin/taglist.vim b/vim_old/plugin/taglist.vim
similarity index 100%
rename from vim/plugin/taglist.vim
rename to vim_old/plugin/taglist.vim
diff --git a/vim/snippets/_.snippets b/vim_old/snippets/_.snippets
similarity index 100%
rename from vim/snippets/_.snippets
rename to vim_old/snippets/_.snippets
diff --git a/vim/snippets/autoit.snippets b/vim_old/snippets/autoit.snippets
similarity index 100%
rename from vim/snippets/autoit.snippets
rename to vim_old/snippets/autoit.snippets
diff --git a/vim/snippets/c.snippets b/vim_old/snippets/c.snippets
similarity index 100%
rename from vim/snippets/c.snippets
rename to vim_old/snippets/c.snippets
diff --git a/vim/snippets/cpp.snippets b/vim_old/snippets/cpp.snippets
similarity index 100%
rename from vim/snippets/cpp.snippets
rename to vim_old/snippets/cpp.snippets
diff --git a/vim/snippets/html.snippets b/vim_old/snippets/html.snippets
similarity index 100%
rename from vim/snippets/html.snippets
rename to vim_old/snippets/html.snippets
diff --git a/vim/snippets/java.snippets b/vim_old/snippets/java.snippets
similarity index 100%
rename from vim/snippets/java.snippets
rename to vim_old/snippets/java.snippets
diff --git a/vim/snippets/javascript.snippets b/vim_old/snippets/javascript.snippets
similarity index 100%
rename from vim/snippets/javascript.snippets
rename to vim_old/snippets/javascript.snippets
diff --git a/vim/snippets/mako.snippets b/vim_old/snippets/mako.snippets
similarity index 100%
rename from vim/snippets/mako.snippets
rename to vim_old/snippets/mako.snippets
diff --git a/vim/snippets/objc.snippets b/vim_old/snippets/objc.snippets
similarity index 100%
rename from vim/snippets/objc.snippets
rename to vim_old/snippets/objc.snippets
diff --git a/vim/snippets/perl.snippets b/vim_old/snippets/perl.snippets
similarity index 100%
rename from vim/snippets/perl.snippets
rename to vim_old/snippets/perl.snippets
diff --git a/vim/snippets/php.snippets b/vim_old/snippets/php.snippets
similarity index 100%
rename from vim/snippets/php.snippets
rename to vim_old/snippets/php.snippets
diff --git a/vim/snippets/python.snippets b/vim_old/snippets/python.snippets
similarity index 100%
rename from vim/snippets/python.snippets
rename to vim_old/snippets/python.snippets
diff --git a/vim/snippets/ruby.snippets b/vim_old/snippets/ruby.snippets
similarity index 100%
rename from vim/snippets/ruby.snippets
rename to vim_old/snippets/ruby.snippets
diff --git a/vim/snippets/sh.snippets b/vim_old/snippets/sh.snippets
similarity index 100%
rename from vim/snippets/sh.snippets
rename to vim_old/snippets/sh.snippets
diff --git a/vim/snippets/snippet.snippets b/vim_old/snippets/snippet.snippets
similarity index 100%
rename from vim/snippets/snippet.snippets
rename to vim_old/snippets/snippet.snippets
diff --git a/vim/snippets/tcl.snippets b/vim_old/snippets/tcl.snippets
similarity index 100%
rename from vim/snippets/tcl.snippets
rename to vim_old/snippets/tcl.snippets
diff --git a/vim/snippets/tex.snippets b/vim_old/snippets/tex.snippets
similarity index 100%
rename from vim/snippets/tex.snippets
rename to vim_old/snippets/tex.snippets
diff --git a/vim/snippets/vim.snippets b/vim_old/snippets/vim.snippets
similarity index 100%
rename from vim/snippets/vim.snippets
rename to vim_old/snippets/vim.snippets
diff --git a/vim/snippets/zsh.snippets b/vim_old/snippets/zsh.snippets
similarity index 100%
rename from vim/snippets/zsh.snippets
rename to vim_old/snippets/zsh.snippets
diff --git a/vim/syntax/jade.vim b/vim_old/syntax/jade.vim
similarity index 100%
rename from vim/syntax/jade.vim
rename to vim_old/syntax/jade.vim
diff --git a/vim/syntax/javascript.vim b/vim_old/syntax/javascript.vim
similarity index 100%
rename from vim/syntax/javascript.vim
rename to vim_old/syntax/javascript.vim
diff --git a/vim/syntax/less.vim b/vim_old/syntax/less.vim
similarity index 100%
rename from vim/syntax/less.vim
rename to vim_old/syntax/less.vim
diff --git a/vim/syntax/php.vim b/vim_old/syntax/php.vim
similarity index 100%
rename from vim/syntax/php.vim
rename to vim_old/syntax/php.vim
diff --git a/vim/syntax/snippet.vim b/vim_old/syntax/snippet.vim
similarity index 100%
rename from vim/syntax/snippet.vim
rename to vim_old/syntax/snippet.vim
diff --git a/vimrc b/vimrc
index 45f6a5f..a1ad816 100644
--- a/vimrc
+++ b/vimrc
@@ -1,21 +1,40 @@
+" pathogen
+call pathogen#runtime_append_all_bundles()
+call pathogen#helptags()
+
+" turn off vi compatability
+set nocompatible
+
+" turn off swapfiles
+set noswapfile
+
+" persistent undo (>7.3)
+set undodir=~/.vim/undodir
+set undofile
+
+" filetype and plugin indentation
 filetype plugin on
 filetype indent on
 
+" search
+set hlsearch
+set incsearch
+set showmatch
+
 syntax enable
 
 set autoindent
 set smartindent
 
+" tabs
 set expandtab
 set smarttab
 set tabstop=4
 set shiftwidth=4
 
 set autoread
-set showmatch
 set mat=2
 set ruler
 set nohls
-set incsearch
 
 au BufNewFile,BufRead *.less set filetype=less