Update git config settings to work with SAS gitgrid
Merge remote branch 'origin/master'