adding surround.vim
Merge branch 'master' of github.com:pyrat/simple_dotfiles

Conflicts:
	.gitmodules
Removing broken section of the vimrc