Merge in gitconfig from 2010 MBP.