add vim.golang bundle
resolve conflict in vimrc