Update git aliases
Cleanup some aliases; set-up prompt better
Misc updates