Merge branch 'master' of github.com:yihaoWang/vimrc

Conflicts:
	vimrc
Merge branch 'master' of github.com:yihaoWang/vimrc