updates
Merge branch 'master' of https://github.com/jiajiawang/vimrc

Conflicts:
	vimrc