vim-go
Merge branch 'master' of github.com:michd/dotfiles

Conflicts:
	.vim/bundle/vim-go