Merge branch 'master' of github.com:phatblat/dotfiles

Conflicts:
	.dotfiles/osx/set-defaults.zsh
	.dotfiles/shell/alias-git.zsh
Add rewriteauthor and user.email aliases