Merged. Removed gitconfig customizations.