Add and change a few git aliases
Merge branch 'master' into mac