update gitmodules
Merge branch 'master' of https://github.com/ohle/vimrc

Conflicts:
	.gitmodules