Go stuff and other crap
Merge branch 'master' of github.com:poeks/dotfiles

Conflicts:
	zshrc
vim error