Surround.vim

Main surround command
Escape tags in Surround.vim
Fix conflict