Added tpope vim-surround
Merge remote-tracking branch 'origin/master' into new-vim

Conflicts:
	.vim/bundle/vim-surround