Improve
Merge branch 'master' of https://github.com/zhihualee/vimfiles

Conflicts:
	.vimrc