Replace defunct go-vim with vim-golang
Merge branch 'master' into laptop