Update gitconfig to be better
Merge