git: Use chris@chrisdown.name if committing to a repo with my handle
Merge remote-tracking branch 'origin/master' into mac