add new git aliases

copied most over from bash/.aliases, will consolidate later.
fix Maven Options

building with maven works better if ms!=mx for unknown reasons