MAINT: Update names in .mailmap for the 1.10 release.

[ci skip]
numpy · charris · Aug 3, 2015 · Aug 2, 2015 · Aug 2, 2015 · ddd66c2b23af8f6d16e0ec1535da1fb276d3e51f
commit ddd66c2b23af8f6d16e0ec1535da1fb276d3e51f
diff --git a/.mailmap b/.mailmap
@@ -1,20 +1,111 @@
 # Prevent git from showing duplicate names with commands like "git shortlog"
-# # See the manpage of git-shortlog for details.
-# # The syntax is:
-# # Name that should be used <email that should be used> Bad name <bad email>
-# #
-# # You can skip Bad name if it is the same as the one that should be used, and is unique.
-# #
-# # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
-# # gives no duplicates.
+# See the manpage of git-shortlog for details.
+# The syntax is:
+# Name that should be used <email that should be used> Bad name <bad email>
+#
+# You can skip Bad name if it is the same as the one that should be used, and is unique.
+#
+# This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
+# gives no duplicates.
 
-Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>
-Ralf Gommers <ralf.gommers@googlemail.com> rgommers <ralf.gommers@googlemail.com>
-Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
+Aaron Baecker <abaecker@localhost> abaecker <abaecker@localhost>
+Abdul Muneer <abdulmuneer@gmail.com> abdulmuneer <abdulmuneer@gmail.com>
+Albert Jornet Puig <albert.jornet@ic3.cat> jurnix <albert.jornet@ic3.cat>
+Alex Griffing <argriffi@ncsu.edu> alex <argriffi@ncsu.edu>
+Alex Griffing <argriffi@ncsu.edu> argriffing <argriffi@ncsu.edu>
+Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@gmail.com>
+Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@users.noreply.github.com>
+Alexander Belopolsky <abalkin@enlnt.com> Alexander Belopolsky <a@enlnt.com>
+Amir Sarabadani <ladsgroup@gmail.com> amir <ladsgroup@gmail.com>
+Anne Archibald <peridot.faceted@gmail.com> aarchiba <peridot.faceted@gmail.com>
+Anže Starič <anze.staric@gmail.com> astaric <anze.staric@gmail.com>
+Aron Ahmadia <aron@ahmadia.net> ahmadia <aron@ahmadia.net>
+Behzad Nouri <behzadnouri@gmail.com> behzad nouri <behzadnouri@gmail.com>
+Benjamin Root <ben.v.root@gmail.com> Ben Root <ben.v.root@gmail.com>
+Benjamin Root <ben.v.root@gmail.com> weathergod <?@?>
+Brett R Murphy <bmurphy@enthought.com> brettrmurphy <bmurphy@enthought.com>
+Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@Laptop-3.local>
+Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@laptop.local>
+Carl Kleffner <cmkleffner@gmail.com> carlkl <cmkleffner@gmail.com>
+Chris Burns <chris.burns@localhost> chris.burns <chris.burns@localhost>
 Christoph Gohlke <cgohlke@uci.edu> Christolph Gohlke <cgohlke@uci.edu>
+Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
 Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
-Ondřej Čertík <ondrej.certik@gmail.com> Ondrej Certik <ondrej.certik@gmail.com>
+Christopher Hanley <chanley@gmail.com> chanley <chanley@gmail.com>
+Daniel J Farrell <danieljfarrel@me.com> danieljfarrell <danieljfarrel@me.com>
+Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> Daniel <muellner@localhost.localdomain>
+Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> dmuellner <Daniel Müllner muellner@math.stanford.edu>
+Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <daniel@meltingwax.net>
+Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <var.mail.daniel@gmail.com>
+David Huard <david.huard@gmail.com> dhuard <dhuard@localhost>
+David M Cooke <cookedm@localhost>  cookedm <cookedm@localhost>
+David Ochoa <ochoadavid@gmail.com> ochoadavid <ochoadavid@gmail.com>
+Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeier <dhomeie@gwdg.de>
+Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeir <derek@astro.phsik.uni-goettingen.de>
+Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homier <derek@astro.physik.uni-goettingen.de>
+Egor Zindy <ezindy@gmail.com> zindy <ezindy@gmail.com>
+Ernest N. Mamikonyan <ernest.mamikonyan@sig.com> mamikony <ernest.mamikonyan@sig.com>
+Evgeny Toder <evgeny.toder@jpmorgan.com> eltjpm <evgeny.toder@jpmorgan.com>
+Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fperez@fperez.org>
+Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org>
+Giuseppe Venturini <ggventurini@users.noreply.github.com> ggventurini <ggventurini@users.noreply.github.com>
+Han Genuit <hangenuit@gmail.com> 87 <hangenuit@gmail.com>
+Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>
+Han Genuit <hangenuit@gmail.com> hangenuit@gmail.com <hangenuit@gmail.com>
+Hanno Klemm <hanno.klemm@maerskoil.com> hklemm <hanno.klemm@maerskoil.com>
+Jaime Fernandez <jaime.frio@gmail.com> Jaime <jaime.frio@gmail.com>
+Jaime Fernandez <jaime.frio@gmail.com> Jaime Fernandez <jaime.fernandez@hp.com>
+Jaime Fernandez <jaime.frio@gmail.com> jaimefrio <jaime.frio@gmail.com>
+Jarrod Millman <millman@berkeley.edu> Jarrod Millman <jarrod.millman@gmail.com>
+Jay Bourque <jay.bourque@continuum.io> jayvius <jay.bourque@continuum.io>
+Jerome Kelleher <jerome.kelleher@ed.ac.uk> jeromekelleher <jerome.kelleher@ed.ac.uk>
+Johannes Schönberger <hannesschoenberger@gmail.com> Johannes Schönberger <jschoenberger@demuc.de>
+Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <jtaylor.debian@googlemail.com>
+Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <juliantaylor108@googlemail.com>
+Lars Buitinck <larsmans@gmail.com> Lars Buitinck <L.J.Buitinck@uva.nl>
+Lars Buitinck <larsmans@gmail.com> Lars Buitinck <l.buitinck@esciencecenter.nl>
+Luis Pedro Coelho <luis@luispedro.org> Luis Pedro Coelho <lpc@cmu.edu>
+Mark DePristo <mdepristo@synapdx.com> markdepristo <mdepristo@synapdx.com>
 Mark Wiebe <mwwiebe@gmail.com> Mark <mwwiebe@gmail.com>
+Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@continuum.io>
 Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@enthought.com>
 Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@georg.(none)>
-Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>
+Martin Goodson <martingoodson@gmail.com> martingoodson <martingoodson@gmail.com>
+Martin Teichmann <martin.teichmann@xfel.eu> Martin Teichmann <lkb.teichmann@gmail.com>
+Mattheus Ueckermann <empeeu@yahoo.com> empeeu <empeeu@yahoo.com>
+Michael Droettboom <mdboom@gmail.com> mdroe <mdroe@localhost>
+Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>
+Nicolas Scheffer <nicolas.scheffer@sri.com> Nicolas Scheffer <scheffer@speech.sri.com>
+Ondřej Čertík <ondrej.certik@gmail.com> Ondrej Certik <ondrej.certik@gmail.com>
+Pat Miller <patmiller@localhost> patmiller <patmiller@localhost>
+Paul Ivanov <pi@berkeley.edu> Paul Ivanov <paul.ivanov@local>
+Paul Jacobson <hpj3@myuw.net> hpaulj <hpj3@myuw.net>
+Pearu Peterson <pearu.peterson@gmail.com> Pearu Peterson <pearu@pearu-laptop.(none)>
+Peter J Cock <p.j.a.cock@googlemail.com> peterjc <p.j.a.cock@googlemail.com>
+Pierre GM <pierregmcode@gmail.com> pierregm <pierregm@localhost>
+Pierre GM <pierregmcode@gmail.com> pierregm <pierregmcode@gmail.com>
+Prabhu Ramachandran <prabhu@localhost> prabhu <prabhu@localhost>
+Ralf Gommers <ralf.gommers@gmail.com> Ralf Gommers <ralf.gommers@googlemail.com>
+Ralf Gommers <ralf.gommers@gmail.com> rgommers <ralf.gommers@googlemail.com>
+Ritta Narita <narittan@gmail.com> RittaNarita <narittan@gmail.com>
+Robert Kern <rkern@enthought.com> Robert Kern <robert.kern@gmail.com>
+Robert LU <robberphex@gmail.com> RobberPhex <robberphex@gmail.com>
+Russell Hewett <rhewett@mit.edu> rhewett <rhewett@mit.edu>
+Ryan Blakemore <rbtnet@gmail.com> ryanblak <rbtnet@gmail.com>
+Sam Preston <j.sam.preston@gmail.com> jspreston <j.sam.preston@gmail.com>
+Saullo Giovani <saullogiovani@gmail.com> saullogiovani <saullogiovani@gmail.com>
+Sebastian Berg <sebastian@sipsolutions.net> seberg <sebastian@sipsolutions.net>
+Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <sjvdwalt@gmail.com>
+Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <stefan@sun.ac.za>
+Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
+Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
+Tim Cera <tim@cerazone.net> tim cera <tcera@sjrwmd.com>
+Tom Poole <t.b.poole@gmail.com> tpoole <t.b.poole@gmail.com>
+Travis Oliphant <travis@continuum.io> Travis E. Oliphant <teoliphant@gmail.com>
+Travis Oliphant <travis@continuum.io> Travis Oliphant <oliphant@enthought.com>
+Valentin Haenel <valentin@haenel.co> Valentin Haenel <valentin.haenel@gmx.de>
+Warren Weckesser <warren.weckesser@enthought.com> Warren Weckesser <warren.weckesser@gmail.com>
+Wendell Smith <wendellwsmith@gmail.com> Wendell Smith <wackywendell@gmail.com>
+William Spotz <wfspotz@sandia.gov@localhost> wfspotz@sandia.gov <wfspotz@sandia.gov@localhost>
+Åsmund Hjulstad <ahju@statoil.com> Åsmund Hjulstad <asmund@hjulstad.com>
+Óscar Villellas Guillén <oscar.villellas@continuum.io> ovillellas <oscar.villellas@continuum.io>