resort and add some git aliases.