Move surround out of tpope.vim
Vim surround with reworking of commonly used surrounds