update all plugin
Merge branch 'master' of https://github.com/zhenlonghe/zhenlong-vimrc

Conflicts:
	plugin/settings/Settings.vim
	vimrc