Use ksdiff as diff- and mergetool
Change git diff alias and add one for reset --hard