Fix .vimrc to impl surround.vim and neorspec.vim