updated .mailmap

Before this, we had many duplicates in git shortlog:
```
23:36@ipython(master)$ git shortlog -sne | wc -l
    295
```

now i think I've gotten rid of all such duplications

```
23:36@ipython(mailmap)$ git shortlog -sne | wc -l
    247
```