add a couple of git aliases
some tidying of git aliases and some new