Remove pathogen as submodule, add surround.vim