Better git aliases, fixed up a few old bash aliases