Remove surround.vim, clean up vimrc