Add vim-surround plugin
merge vimrc