Add some new useful git aliases
Merge branch 'master' into knewton