Remove vim-surround
Add vim-operator-surround