vimrc update, plus surround plugin