" Backspace should work across lines
set bs=2
-" Make vim aware of filetypes
-filetype plugin on
-
-
" Read files from ~/.vim
-source ~/.vim/backup.vim
source ~/.vim/state.vim
source ~/.vim/display.vim
-source ~/.vim/mouse.vim
source ~/.vim/indent.vim
-source ~/.vim/search.vim
-source ~/.vim/abbrsout.vim
-source ~/.vim/commands.vim
+source ~/.vim/macros.vim
+source ~/.vim/commenter.vim
+source ~/.vim/filetypes.vim
+if filereadable(expand("~/.vim/local.vim"))
+ source ~/.vim/local.vim
+endif