Add a few git aliases (rollback, root, etc.).  Use patience diff everywhere.  Formatting fixes.