Added surround
updated vimrc minor changes