hopefully similar changes on the other end
Merge branch 'master' of github.com:gak/dotfiles

Conflicts:
	home/.gitconfig
	home/.zshrc