sorted git aliases
Merge remote-tracking branch 'origin/snowgun'