Cleanup duplicate diff/mergetool entries in .gitconfig
Stop tracking TotalTerminal and Delibar prefs