Bring in my gitconfig changes