Remove git-template and clean up diff/merge tools