gitconfig.erb: Update Kaleidoscope wrapper. Add it as default mergetool for OSX.