update vimrc
Merge branch 'master' of https://github.com/barrymoo/vim-setup