updated difftool/mergetool for git
changed the bin path for my personal stuff to keep ~ clean