Cleaned up vimdc
Add surround.
Merge branch 'master' of https://github.com/marcusm/vimfiles

Conflicts:
	vimrc