Configure git to use opendiff as mergetool
Aliases for git clean and others