update vimrc for latest plugins
Merge branch 'master' of https://github.com/wanghaidong/dotfiles