changing git aliases back, again
Merge branch 'master' into cars