加入vim中文手册
Merge branch 'master' of github.com:jiazhoulvke/myvim

Conflicts:
	vim_plugins.vim