Installation script
Merge branch 'master' of github.com:johngeorgewright/vim-config

Conflicts:
	.gitmodules