trivial
Merge branch 'master' of https://www.github.com/xiechao06/.vim

Conflicts:
	.vimrc