Re-ordered .gitconfig for readability