modified:   .gitmodules
	deleted:    bundle/omnicppcomplete
Merge branch 'master' of https://github.com/solomonwzs/dotvim