Reverted to basic vim with pathogen.
Pulled in vim-sensible as a submodule.