Updates and .gitconfig changes