Add surround.vim and update vimrc for windows