setup ghq
Merge branches 'master' and 'master' of github.com:keqh/dotfiles

Conflicts:
	zshrc