latest
Merge branch 'master' of github.com:bflyblue/vimrc

Conflicts:
	.gitmodules