Update .mailmap

Drop lines that aren't needed.
Add lines to deduplicate people.
Add lines to add/fix some names.

.mailmap

@@ -13,90 +13,96 @@ Bogdan Sinitsyn <[email protected]>
 Brandon S Allbery KF8NH <[email protected]>
 Brandon S Allbery KF8NH <[email protected]> <[email protected]>
 Brent Yorgey <[email protected]> <[email protected]>
+Bruce Forte <[email protected]>
 Carlos Lopez-Camey <[email protected]>
 Carsten Otto <[email protected]>
+Cesar Crusius <[email protected]> <[email protected]>
 Christian Dietrich <[email protected]>
 Christian Wills <[email protected]>
 Daniel Neri <[email protected]> <[email protected]>
-Daniel Schoepe <daniel.schoepe@googlemail.com> <[email protected]>
-Daniel Schoepe <daniel.schoepe@googlemail.com> <daniel.schoepe@gmail.com>
+Daniel Schoepe <daniel.schoepe@gmail.com> <[email protected]>
+Daniel Schoepe <daniel.schoepe@gmail.com> <daniel.schoepe@googlemail.com>
 Daniel Wagner <[email protected]> <[email protected]>
 Dave Harrison <[email protected]>
+Dave Macias <[email protected]>
 David Glasser <[email protected]>
 David McLean <[email protected]>
+Devin Mullins <[email protected]> <[email protected]>
 Devin Mullins <[email protected]> <[email protected]>
 Dominik Bruhn <[email protected]>
 Don Stewart <[email protected]> <[email protected]>
 Don Stewart <[email protected]> <[email protected]>
 Edward Z. Yang <[email protected]>
+Evgeny Kurnevsky <[email protected]>
 Gwern Branwen <[email protected]>
 Gwern Branwen <[email protected]> <[email protected]>
 Henrique Abreu <[email protected]>
 Ilya Portnov <[email protected]>
-intrigeri <[email protected]>
+Ivan Brennen <[email protected]>
+Ivan Brennen <[email protected]> <[email protected]>
 Ivan Miljenovic <[email protected]>
 Jan-David Quesel <[email protected]>
 Jens Petersen <[email protected]> <[email protected]>
 Jeremy Apthorp <[email protected]>
 Joachim Breitner <[email protected]>
 Joachim Fasting <[email protected]>
-Joel Suovaniemi <[email protected]>
+Joan Milev <[email protected]> <[email protected]>
 Joe Thornber <[email protected]>
+Joel Suovaniemi <[email protected]>
 Johann Giwer <[email protected]>
 Jussi Maki <[email protected]>
 Konstantin Sobolev <[email protected]>
+L. S. Leary <[email protected]>
 Lanny Ripple <[email protected]>
 Lei Chen <[email protected]>
+Leon Kowarschick <[email protected]>
+Leon Kowarschick <[email protected]> <[email protected]>
 Leonardo Serra <[email protected]>
+Luc Duzan <[email protected]>
+Luc Duzan <[email protected]> <[email protected]>
 Luis Cabellos <[email protected]>
 Lukas Mai <[email protected]>
 Mario Pastorelli <[email protected]>
 Mathias Stearn <[email protected]>
 Matt Brown <[email protected]>
 Matthew Hague <[email protected]>
+Michael G. Sloan <[email protected]>
 Nathaniel Filardo <[email protected]>
 Nelson Elhage <[email protected]>
 Nicolas Dudebout <[email protected]>
 Nicolas Pouillard <[email protected]>
 Nils Schweinsberg <[email protected]>
 Norbert Zeh <[email protected]>
+Peter J. Jones <[email protected]>
+Peter J. Jones <[email protected]> <[email protected]>
 Peter Olson <[email protected]>
 Quentin Moser <[email protected]>
-Quentin Moser <[email protected]>
+Quentin Moser <[email protected]> <[email protected]>
 Rickard Gustafsson <[email protected]>
 Robert Marlow <[email protected]>
 Robert Marlow <[email protected]> <[email protected]>
 Rohan Jain <[email protected]>
-Sibi Prabakaran <[email protected]> <[email protected]>
 Sean Escriva <[email protected]>
 Sean McEligot <[email protected]>
+Sibi Prabakaran <[email protected]>
 Spencer Janssen <[email protected]> <[email protected]>
-Tomohiro Matsuyama <matsuyama3@ariel-networks.com>
+Timothy Hobbs <tim.thelion@gmail.com>
 Tom Rauchenwald <[email protected]>
+Tom Smeets <[email protected]> <[email protected]>
+Tomas Janousek <[email protected]>
+Tomohiro Matsuyama <[email protected]>
 Tony Morris <[email protected]>
 Valery V. Vorotyntsev <[email protected]>
 Will Farrington <[email protected]>
 Wirt Wolff <[email protected]>
 Yaakov Nemoy <[email protected]>
+Yclept Nemo <[email protected]> <pscjtwjdjtAhnbjm/dpn>
+Yecine Megdiche <[email protected]> <[email protected]>
 
-brian <[email protected]>
-cardboard42 <[email protected]>
-daedalusinfinity <[email protected]>
 hexago.nl <[email protected]>
-intrigeri <[email protected]>
-jakob <[email protected]>
-kedals0 <[email protected]>
 lithis <[email protected]>
 lithis <[email protected]> <[email protected]>
-longpoke <[email protected]>
-md143rbh7f <[email protected]>
-perlkat <[email protected]>
-rupa <[email protected]> <[email protected]>
-timthelion <[email protected]>
-
-# for core only
-Neil Mitchell <http://www.cs.york.ac.uk/~ndm/>, Neil Mitchell
-Nick Burlett <[email protected]>
-Sam Hughes   <[email protected]>
-Shae Erisson <[email protected]>
-Conrad Irwin <[email protected]>
+sam-barr <[email protected]> <[email protected]>
+slotThe <[email protected]> <[email protected]>
+slotThe <[email protected]> <[email protected]>
+spoonm <[email protected]>