zsh git aliases
updated git fns and aliases
updated git fns and aliases
Merge branch 'master' into desktop