Merged petsc/petsc into rmills/petsc master

.mailmap: current names and emails, improves 'git shortlog' output