Changes from nowra
Merge branch 'master' of https://github.com/jjfiv/vim-repo

Conflicts:
	.gitmodules