fix
Merge branch 'master' of https://github.com/linshibo/myvim

Conflicts:
	.vim/comm.vim
fix