adding in recent changes
Merge branch 'master' of https://github.com/jasoncorbett/personalconfigs

Conflicts:
	.gitmodules
	.vimrc