made some changes
Merge branch 'master' of github.com:googoid/vimconfig-windows

Conflicts:
	.gitmodules