Add vim-surround
Adjust vim