Committing some changes
Merge branch 'master' of github.com:cdeboever3/dotvim

Conflicts:
	.gitmodules
	vimrc