yep
Merge branch 'master' of github.com:jmayfield74/thevims

Conflicts:
	.vimrc