Added surround.vim, and a bunch of tweaks to vimrc.