some clean up
Merge branch 'master' of https://github.com/yongzhy/vimconfig
resolve conflict

Conflicts:
	.gitmodules
	.vim/vimrcs/basic.vim