MAINT: A few more .mailmap entries

effigies · effigies · commit 30ed5cf74343 · 2018-09-19T19:06:16.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -1,12 +1,15 @@
 Aimi Watanabe <watanabe.aimi@gmail.com> stymy <rschadmin@cmi-rsch-li002.childmind.org>
 Aimi Watanabe <watanabe.aimi@gmail.com> stymy <watanabe.aimi@gmail.com>
+Alejandro Tabas <alextabas@gmail.com> qTabs <qtabas@gmail.com>
+Alejandro Tabas <alextabas@gmail.com> qtabs <alextabas@gmail.com>
 Alejandro de la Vega <aleph4@gmail.com> adelavega <delavega@utexas.edu>
 Alexander Schaefer <alexschaefer83@gmail.com> Alexander Schaefer <aschaefer@melisse.cbs.mpg.de>
 Alexander Schaefer <alexschaefer83@gmail.com> alexschaefer83 <alexschaefer83@gmail.com>
 Alexander Schaefer <alexschaefer83@gmail.com> aschaefer <aschaefer@aschaefer-U36SD.(none)>
 Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@gmail.com>
 Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@users.noreply.github.com>
 Alexandre M. Savio <alexsavio@gmail.com> Alexandre Manhaes Savio <alexsavio@gmail.com>
+Andrey Chetverikov <stop.psy@gmail.com> Andrey Chetverikov <achetverikov@users.noreply.github.com>
 Andrey Chetverikov <stop.psy@gmail.com> achetverikov <stop.psy@gmail.com>
 Anisha Keshavan <akeshavan@gmail.com> Anisha Keshavan <akeshavan@ucla.edu>
 Anisha Keshavan <akeshavan@gmail.com> akeshavan <keshavan@berkeley.edu>
@@ -71,8 +74,8 @@ Hans Johnson <hans-johnson@uiowa.edu> Hans Johnson <hans.j.johnson@gmail.com>
 Hans Johnson <hans-johnson@uiowa.edu> hjmjohnson <hans.j.johnson@gmail.com>
 Horea Christian <horea.christ@yandex.com> Horea Christian <h.chr@mail.ru>
 Isaac Schwabacher <ischwabacher@wisc.edu> ischwabacher <ischwabacher@wisc.edu>
-Jakub Kaczmarzyk <jakubk@mit.edu> kaczmarj <jakubk@mit.edu>
 Jakub Kaczmarzyk <jakubk@mit.edu> jakubk <jakubk@mit.edu>
+Jakub Kaczmarzyk <jakubk@mit.edu> kaczmarj <jakubk@mit.edu>
 James Kent <james-kent@uiowa.edu> jdkent <james-kent@uiowa.edu>
 Janosch Linkersdörfer <linkersdoerfer@gmail.com> Januzz <linkersdoerfer@gmail.com>
 Jason Wong <jf126dolphin@gmail.com> Jason <jf126dolphin@gmail.com>
@@ -81,11 +84,12 @@ Jason Wong <jf126dolphin@gmail.com> Jason W <jf126dolphin@gmail.com>
 Jason Wong <jf126dolphin@gmail.com> jason <jf126dolphin@gmail.com>
 Jason Wong <jf126dolphin@gmail.com> jason-wg <jf126dolphin@gmail.com>
 Jens Kleesiek <kleesiek@uni-heidelberg.de> JensNRAD <kleesiek@uni-heidelberg.de>
-Jérémy Guillon <jeremy.guillon@inria.fr> GUILLON Jeremy <jeremy.guillon@etu.upmc.fr>
 Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
+Jérémy Guillon <jeremy.guillon@inria.fr> GUILLON Jeremy <jeremy.guillon@etu.upmc.fr>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Joerg Stadler <joerg.stadler@lin-magdeburg.de>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Jörg Stadler <Stadler@lin-magdeburg.de>
 Joke Durnez <joke.durnez@gmail.com> jokedurnez <joke.durnez@gmail.com>
+Josh Warner <silvertrumpet999+github@gmail.com> JDWarner <warner.joshua@mayo.edu>
 Josh Warner <silvertrumpet999+github@gmail.com> Josh Warner (Mac) <warner.joshua@mayo.edu>
 Kai Schlamp <schlamp@gmx.de> medihack <schlamp@gmx.de>Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
 Katie Bottenhorn <kbott006@fiu.edu> 62442katieb <kbott006@fiu.edu>
@@ -100,18 +104,21 @@ Kevin Sitek <ksitek@mit.edu> sitek <ksitek@mit.edu>
 Kevin Sitek <ksitek@mit.edu> sitek <sitek.kevin@gmail.com>
 Leonie Lampe <leonie.lampe@gmail.com> Leonie Lmape <leonie.lampe@gmail.com>
 Lukas Snoek <lukassnoek@gmail.com> Lukas Snoek <lukassnoek@gmail.com>
+Marcel Falkiewicz <mfalkiewicz@gmail.com> Marcel Falkiewicz <m.falkiewicz@nencki.gov.pl>
+Mathias Goncalves <goncalves.mathias@gmail.com> Mathias Goncalves <mathiasg@mit.edu>
 Mathias Goncalves <goncalves.mathias@gmail.com> mathiasg <mathiasg@mit.edu>
 Mathieu Dubois <mathieu.dubois@icm-institute.org> Mathieu Dubois <mathieu.dubois@cea.fr>
 Mathieu Dubois <mathieu.dubois@icm-institute.org> duboism <duboismathieu_gaas@yahoo.fr>
 Matteo Mancini <ingmatteomancini@gmail.com> matteomancini <ingmatteomancini@gmail.com>
-Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu> mvdoc <matteo.visconti.gr@dartmouth.edu>
 Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <mvdoc.gr@dartmouth.edu>
+Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu> mvdoc <matteo.visconti.gr@dartmouth.edu>
 Michael Clark <michael.clark195@gmail.com> Clark <clarkmg@nih.gov>
 Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.comp@gmail.com>
 Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.research@gmail.com>
 Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
 Michael Notter <michaelnotter@hotmail.com> miykael <michaelnotter@hotmail.com>
 Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@mit.edu>
+Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@nyu.edu>
 Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@stanford.edu>
 Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@mit.edu>
 Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@nyu.edu>

-Original file line number
+Diff line change
@@ @@ -1,12 +1,15 @@ @@
 Aimi Watanabe <[email protected]> stymy <[email protected]>
 Aimi Watanabe <[email protected]> stymy <[email protected]>
 +Alejandro Tabas <[email protected]> qTabs <[email protected]>
 +Alejandro Tabas <[email protected]> qtabs <[email protected]>
 Alejandro de la Vega <[email protected]> adelavega <[email protected]>
 Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
 Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
 Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
 Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
 Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
 Alexandre M. Savio <[email protected]> Alexandre Manhaes Savio <[email protected]>
 +Andrey Chetverikov <[email protected]> Andrey Chetverikov <[email protected]>
 Andrey Chetverikov <[email protected]> achetverikov <[email protected]>
 Anisha Keshavan <[email protected]> Anisha Keshavan <[email protected]>
 Anisha Keshavan <[email protected]> akeshavan <[email protected]>
 Hans Johnson <[email protected]> hjmjohnson <[email protected]>
 Horea Christian <[email protected]> Horea Christian <[email protected]>
 Isaac Schwabacher <[email protected]> ischwabacher <[email protected]>
 -Jakub Kaczmarzyk <[email protected]> kaczmarj <[email protected]>
 Jakub Kaczmarzyk <[email protected]> jakubk <[email protected]>
 +Jakub Kaczmarzyk <[email protected]> kaczmarj <[email protected]>
 James Kent <[email protected]> jdkent <[email protected]>
 Janosch Linkersdörfer <[email protected]> Januzz <[email protected]>
 Jason Wong <[email protected]> Jason <[email protected]>
 Jason Wong <[email protected]> jason <[email protected]>
 Jason Wong <[email protected]> jason-wg <[email protected]>
 Jens Kleesiek <[email protected]> JensNRAD <[email protected]>
 -Jérémy Guillon <[email protected]> GUILLON Jeremy <[email protected]>
 Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
 +Jérémy Guillon <[email protected]> GUILLON Jeremy <[email protected]>
 Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
 Joerg Stadler <[email protected]> Jörg Stadler <[email protected]>
 Joke Durnez <[email protected]> jokedurnez <[email protected]>
 +Josh Warner <[email protected]> JDWarner <[email protected]>
 Josh Warner <[email protected]> Josh Warner (Mac) <[email protected]>
 Kai Schlamp <[email protected]> medihack <[email protected]>Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
 Katie Bottenhorn <[email protected]> 62442katieb <[email protected]>
 Kevin Sitek <[email protected]> sitek <[email protected]>
 Leonie Lampe <[email protected]> Leonie Lmape <[email protected]>
 Lukas Snoek <[email protected]> Lukas Snoek <[email protected]>
 +Marcel Falkiewicz <[email protected]> Marcel Falkiewicz <[email protected]>
 +Mathias Goncalves <[email protected]> Mathias Goncalves <[email protected]>
 Mathias Goncalves <[email protected]> mathiasg <[email protected]>
 Mathieu Dubois <[email protected]> Mathieu Dubois <[email protected]>
 Mathieu Dubois <[email protected]> duboism <[email protected]>
 Matteo Mancini <[email protected]> matteomancini <[email protected]>
 -Matteo Visconti dOC <[email protected]> mvdoc <[email protected]>
 Matteo Visconti dOC <[email protected]> Matteo Visconti dOC <[email protected]>
 +Matteo Visconti dOC <[email protected]> mvdoc <[email protected]>
 Michael Clark <[email protected]> Clark <[email protected]>
 Michael Dayan <[email protected]> Michael <[email protected]>
 Michael Dayan <[email protected]> Michael <[email protected]>
 Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
 Michael Notter <[email protected]> miykael <[email protected]>
 Michael Waskom <[email protected]> Michael Waskom <[email protected]>
 +Michael Waskom <[email protected]> Michael Waskom <[email protected]>
 Michael Waskom <[email protected]> Michael Waskom <[email protected]>
 Michael Waskom <[email protected]> mwaskom <[email protected]>
 Michael Waskom <[email protected]> mwaskom <[email protected]>