修改插件配置
Merge branch 'master' of github.com:jiazhoulvke/myvim

Conflicts:
	vim_config_plugins.vim