better faster stronger
Merge branch 'master' of github.com:kaleb/vim-files

Conflicts:
	.gitmodules