no shared zsh history. more git aliases.
Merge branch 'master' of github.com:gak/dotfiles

Conflicts:
	home/.gitconfig