New module
Merge branch 'master' of github.com:knutster/vim

Conflicts:
	.gitmodules