vim update
Merge branch 'master' of https://github.com/alanerzhao/Vim-setting