ENH: to make two Michaels into one

After the merge it would look like this:

```
$> git shortlog -sn             
   668  Michael Waskom
     8  John B. Cole
     7  Paul Hobson
     4  Olga Botvinnik
     2  Tobias Megies
     1  Daniel B. Allan
     1  Miikka Koskinen
     1  Tal Yarkoni
     1  Tom Augspurger
     1  Yaroslav Halchenko
```