updated gitconfig
various fixes for osx