Updated surround.vim plugin