Added vim-surround plugin
Merge branch 'master' of https://github.com/cloudchen/vimrc

Conflicts:
	vimrc