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