remove bundle conflicts with goimports
Merge branch 'master' of github.com:Xuyuanp/vimrc