git: If zsh, work around (zsh bug?) issue where command is in $@
Merge remote-tracking branch 'origin/master' into mac