Adding a couple of git aliases and a mergetool change