Updates.
Merge remote-tracking branch 'origin'
Added some helpful git aliases.