Update .mailmap

With this update, the output of:

```sh
git shortlog -sne | cut -f 2 | sort | uniq
```

is much closer to the current contents of AUTHORS.txt.

Closes #5037.