Merged in some gitconfig settings from work