Comment git push behaviour for now

Earlier git versions don't understand the syntax
Add meld mergetool
Stop zsh from suggesting auto corrections