Handle .gitconfig for linux and move git difftool configuration in gitconfig_osx template