Uses vim-gocode instead of go-vim.
manual merge