Merging this with my work .gitconfig