Updates!
Merge branch 'master' of github.com:tomgco/.vim

Conflicts:
	vimrc