bunch of changes, lots of new git aliases