Yes
Merge branch 'master' of github.com:kirstein/vim

Conflicts:
	.gitmodules