From effcb37b5a6ca6e9185007e35a0e7163e4fb41c7 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Fri, 22 Feb 2019 12:06:08 -0500
Subject: [PATCH] MNT: Update .mailmap, .zenodo.json

---
 .mailmap     |  5 +++++
 .zenodo.json | 29 ++++++++++++-----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.mailmap b/.mailmap
index 59c81dc119..d58a4ea5ac 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,6 +16,7 @@ Anisha Keshavan <akeshavan@gmail.com> Anisha Keshavan <akeshavan@ucla.edu>
 Anisha Keshavan <akeshavan@gmail.com> akeshavan <keshavan@berkeley.edu>
 Ariel Rokem <arokem@berkeley.edu> arokem <arokem@berkeley.edu>
 Ariel Rokem <arokem@berkeley.edu> arokem <arokem@gmail.com>
+Ariel Rokem <arokem@berkeley.edu> Ariel Rokem <arokem@gmail.com>
 Arman Eshaghi <arman.eshaghi@gmail.com> armaneshaghi <arman.eshaghi@gmail.com>
 Ashely Gillman <gillmanash@gmail.com> Ashley Gillman <ashley.gillman@csiro.au>
 Ashely Gillman <gillmanash@gmail.com> ashgillman <ashley.gillman@csiro.au>
@@ -73,6 +74,7 @@ Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux
 Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@noramlesup.org>
 Gavin Cooper <Gavin.Cooper@newcastle.edu.au> gjcooper <gjcooper@gmail.com>
 Gilles de Hollander <gilles.de.hollander@gmail.com> Gilles86 <gilles.de.hollander@gmail.com>
+Gio Piantoni <github@gpiantoni.com> Gio at UMCU <github@gpiantoni.com>
 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>
@@ -91,6 +93,9 @@ Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.ed
 Jéré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>
+Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Joerg Stadler <jstadler@ilin-magdeburg.de>
+John Lee <johnleenimh@gmail.com> leej3 <johnleenimh@gmail.com>
+John Lee <johnleenimh@gmail.com> john anthony lee <johnleenimh@gmail.com>
 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>
diff --git a/.zenodo.json b/.zenodo.json
index 4d25cefa52..4e9b4c002c 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -141,16 +141,16 @@
     {
       "name": "Berleant, Shoshana"
     },
-    {
-      "affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
-      "name": "Horea, Christian",
-      "orcid": "0000-0001-7037-2449"
-    },
     {
       "affiliation": "Dartmouth College: Hanover, NH, United States",
       "name": "Halchenko, Yaroslav O.",
       "orcid": "0000-0003-3456-2493"
     },
+    {
+      "affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
+      "name": "Christian, Horea",
+      "orcid": "0000-0001-7037-2449"
+    },
     {
       "affiliation": "UC San Diego",
       "name": "Cipollini, Ben",
@@ -186,7 +186,7 @@
     },
     {
       "affiliation": "Athena EPI, Inria Sophia-Antipolis",
-      "name": "Wassermann , Demian",
+      "name": "Wassermann, Demian",
       "orcid": "0000-0001-5194-6056"
     },
     {
@@ -196,7 +196,7 @@
     },
     {
       "affiliation": "Vrije Universiteit, Amsterdam",
-      "name": "Gilles de Hollander",
+      "name": "de Hollander, Gilles",
       "orcid": "0000-0003-1988-5091"
     },
     {
@@ -358,6 +358,11 @@
       "affiliation": "The University of Sydney",
       "name": "Liu, Siqi"
     },
+    {
+      "affiliation": "Leibniz Institute for Neurobiology",
+      "name": "Stadler, J\u00f6rg",
+      "orcid": "0000-0003-4313-129X"
+    },
     {
       "affiliation": "University of Pennsylvania",
       "name": "Kahn, Ari E.",
@@ -377,11 +382,6 @@
       "affiliation": "MPI CBS Leipzig, Germany",
       "name": "Lampe, Leonie"
     },
-    {
-      "affiliation": "Leibniz Institute for Neurobiology",
-      "name": "Stadler, J\u00f6rg",
-      "orcid": "0000-0003-4313-129X"
-    },
     {
       "affiliation": "State Key Laboratory of Cognitive Neuroscience and Learning & IDG/McGovern Institute for Brain Research, Beijing Normal University, Beijing, China; Max Planck Institute for Psycholinguistics, Nijmegen, the Netherlands",
       "name": "Kong, Xiang-Zhen",
@@ -604,11 +604,6 @@
       "affiliation": "MIT, HMS",
       "name": "Ghosh, Satrajit",
       "orcid": "0000-0002-5312-6729"
-    },
-    {
-      "affiliation": "ARAMIS LAB, Brain and Spine Institute (ICM), Paris, France.",
-      "name": "Guillon, Jeremy",
-      "orcid": "0000-0002-2672-7510"
     }
   ],
   "keywords": [