Who knows.
Merge branch 'master' of https://github.com/RyanJenkins/dot-vim

Conflicts:
	.gitmodules