update surround.vim to v2