Cleanup

.vim/options.vim

@@ -1,12 +1,5 @@
 set nocompatible
 
-if &shell =~ 'bin/fish'
-    set shell=/bin/sh
-endif
-
-runtime bundle/vim-pathogen/autoload/pathogen.vim
-execute pathogen#infect()
-
 filetype indent plugin on
 colorscheme molokai
 syntax enable
@@ -59,3 +52,7 @@ if has('gui_running')
     set guioptions-=m
     set guioptions-=r
 endif
+
+if &shell =~ 'bin/fish'
+    set shell=/bin/sh
+endif

.vim/plugins.vim

@@ -1,3 +1,7 @@
+" vim-pathogen
+runtime bundle/vim-pathogen/autoload/pathogen.vim
+execute pathogen#infect()
+
 " ag.vim
 let g:ag_working_path_mode="r"