Finish tuning the mailmap file, and regen README.

Now all the duplicate CONTRIBUTORS have been removed.

This fixes #121.  Thanks, @dolmen!