xxx
加入cvim
Merge branch 'master' of https://github.com/Deanzear/vim

Conflicts:
	.gitmodules