Add a better status line
Switch shell only if needed
Take some of Marco's git aliases