update .vimrc
Merge branch 'master' of github.com:aszxqw/etc