added surround plugin
minor fixes to .vimrc