diff --git a/.mailmap b/.mailmap
index 3d6e706c5..06fa1ca57 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,13 +2,21 @@ Aaron Culich <aculich@gmail.com> Aaron Culich <aculich@eecs.berkeley.edu>
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> <minrk@Mercury.local>
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> Min RK
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
+Barry Wark <barrywark@gmail.com> Barry Wark <barrywarkatgmaildotcom>
+Ben Edwards <bedwards@cs.unm.edu> Ben Edwards <bedwards@sausage.(none)>
 Bradley M. Froehle <brad.froehle@gmail.com> Bradley M. Froehle <bfroehle@math.berkeley.edu>
+Bradley M. Froehle <brad.froehle@gmail.com> Bradley Froehle <brad.froehle@gmail.com>
 Brandon Parsons <brandon@parsonstx.com> Brandon Parsons <brandon.parsons@hp.com>
 Brian E. Granger <ellisonbg@gmail.com> Brian Granger
 Brian E. Granger <ellisonbg@gmail.com> Brian Granger <>
 Brian E. Granger <ellisonbg@gmail.com> bgranger <>
 Brian E. Granger <ellisonbg@gmail.com> bgranger <bgranger@red>
-Paul Ivanov <pivanov314@gmail.com> Paul Ivanov <pi@berkeley.edu>
+Damián Avila <damianavila82@yahoo.com.ar> damianavila <damianavila82@yahoo.com.ar>
+Darren Dale <dsdale24@gmail.com> darren.dale <>
+Darren Dale <dsdale24@gmail.com> Darren Dale <>
+Dav Clark <davclark@berkeley.edu> Dav Clark <>
+David Warde-Farley <wardefar@iro.umontreal.ca> David Warde-Farley <>
+Eugene Van den Bulke <eugene.van-den-bulke@gmail.com> Eugene Van den Bulke <eugene.vandenbulke@gmail.com>
 Evan Patterson <epatters@enthought.com> <epatters@EPattersons-MacBook-Pro.local>
 Evan Patterson <epatters@enthought.com> <epatters@evan-laptop.localdomain>
 Evan Patterson <epatters@enthought.com> <epatters@caltech.edu>
@@ -23,11 +31,28 @@ Fernando Perez <Fernando.Perez@berkeley.edu> fperez <>
 Fernando Perez <Fernando.Perez@berkeley.edu> fptest <>
 Fernando Perez <Fernando.Perez@berkeley.edu> fptest1 <>
 Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fernando.perez@berkeley.edu>
+Fernando Perez <fernando.perez@berkeley.edu> Fernando Perez <>
+Fernando Perez <fernando.perez@berkeley.edu> Fernando Perez <fperez@maqroll>
+Frank Murphy <fpmurphy@mtu.edu> Frank Murphy <fmurphy@arbor.net>
 Gael Varoquaux <gael.varoquaux@normalesup.org> gael.varoquaux <>
 Gael Varoquaux <gael.varoquaux@normalesup.org> gvaroquaux <gvaroquaux@gvaroquaux-desktop>
+Gael Varoquaux <gael.varoquaux@normalesup.org> Gael Varoquaux <>
+jakobgager <jakob.gager@gmail.com> jakobgager <gager@ilsb.tuwien.ac.at>
+jakobgager <jakob.gager@gmail.com> jakobgager <jakobgager@hotmail.com>
+Jason Grout <jason.grout@drake.edu> Jason Grout <jason-github@creativetrax.com>
+Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens Hedegaard Nielsen <jhn@jhn-Znote.(none)>
+Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H Nielsen <jenshnielsen@gmail.com>
+Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jenshnielsen@gmail.com>
+Jez Ng <jezreel@gmail.com> Jez Ng <me@jezng.com>
+Jonathan Frederic <jdfreder@calpoly.edu> Jonathan Frederic <jonathan@LifebookMint.(none)>
 Jonathan March <jmarch@enthought.com> Jonathan March <JDM@MarchRay.net>
 Jonathan March <jmarch@enthought.com> jdmarch <JDM@marchRay.net>
 Jörgen Stenarson <jorgen.stenarson@kroywen.se> Jörgen Stenarson <jorgen.stenarson@bostream.nu>
+Jörgen Stenarson <jorgen.stenarson@kroywen.se> Jorgen Stenarson <jorgen.stenarson@bostream.nu>
+Jörgen Stenarson <jorgen.stenarson@kroywen.se> Jorgen Stenarson <>
+Jörgen Stenarson <jorgen.stenarson@kroywen.se> jstenar <jorgen.stenarson@bostream.nu>
+Jörgen Stenarson <jorgen.stenarson@kroywen.se> jstenar <>
+Jörgen Stenarson <jorgen.stenarson@kroywen.se> Jörgen Stenarson <jorgen.stenarson@kroywen.se>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> <laurent.dufrechou@gmail.com>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> <laurent@Pep>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent dufrechou <>
@@ -35,20 +60,45 @@ Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent.dufrechou <>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> Laurent Dufrechou <>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent.dufrechou@gmail.com <>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> ldufrechou <ldufrechou@PEP>
-Matthias BUSSONNIER <bussonniermatthias@gmail.com> Bussonnier Matthias <bussonniermatthias@gmail.com>
-Matthias BUSSONNIER <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@umr168-curn-1-24x-6561.curie.fr>
-Matthias BUSSONNIER <bussonniermatthias@gmail.com> Matthias Bussonnier <carreau@Aspire.(none)>
+Luis Pedro Coelho <luis@luispedro.org> Luis Pedro Coelho <lpc@cmu.edu>
+Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@gmail.com>
+Matthias Bussonnier <bussonniermatthias@gmail.com> Bussonnier Matthias <bussonniermatthias@gmail.com>
+Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@umr168-curn-1-24x-6561.curie.fr>
+Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias Bussonnier <carreau@Aspire.(none)>
+Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdroe@stsci.edu>
 Nicolas Rougier <Nicolas.Rougier@inria.fr> <Nicolas.rougier@inria.fr>
 Omar Andrés Zapata Mesa <andresete.chaos@gmail.com> Omar Andres Zapata Mesa <andresete.chaos@gmail.com>
+Omar Andrés Zapata Mesa <andresete.chaos@gmail.com> Omar Andres Zapata Mesa <omazapa@tuxhome>
+Paul Ivanov <pi@berkeley.edu> Paul Ivanov <pivanov314@gmail.com>
+Pauli Virtanen <pauli.virtanen@iki.fi> Pauli Virtanen <>
+Pauli Virtanen <pauli.virtanen@iki.fi> Pauli Virtanen <pav@iki.fi>
+Pietro Berkes <pberkes@enthought.com> Pietro Berkes <pietro.berkes@googlemail.com>
 Piti Ongmongkolkul <piti118@gmail.com> piti118 <piti118@gmail.com>
+Prabhu Ramachandran <prabhu@enthought.com> Prabhu Ramachandran <>
+Puneeth Chaganti <punchagan@gmail.com> Puneeth Chaganti <punchagan@muse-amuse.in>
 Robert Kern <robert.kern@gmail.com> rkern <>
+Robert Kern <robert.kern@gmail.com> Robert Kern <rkern@enthought.com>
+Robert Kern <robert.kern@gmail.com> Robert Kern <rkern@Sacrilege.local>
+Robert Kern <robert.kern@gmail.com> Robert Kern <>
+Robert Marchman <bo.marchman@gmail.com> Robert Marchman <robert.l.marchman@dartmouth.edu>
 Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satra@ba5.mit.edu>
+Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satrajit.ghosh@gmail.com>
+smithj1 <smithj1@LMC-022896.local> smithj1 <smithj1@LMC-022896.swisscom.com>
+smithj1 <smithj1@LMC-022896.local> smithj1 <smithj1@lmc-022896.local>
 Steven Johnson <steven.johnson@drake.edu> stevenJohnson <steven.johnson@drake.edu>
+s8weber <s8weber@c4.usr.sh> s8weber <s8weber@c5.usr.sh>
+Stefan van der Walt <stefan@sun.ac.za> Stefan van der Walt <bzr@mentat.za.net>
 Thomas Kluyver <takowl@gmail.com> Thomas <takowl@gmail.com>
 Thomas Spura <tomspur@fedoraproject.org> Thomas Spura <thomas.spura@gmail.com>
 Timo Paulssen <timonator@perpetuum-immobile.de> timo <timonator@perpetuum-immobile.de>
+vds <vds@VIVIAN> vds2212 <vds2212@VIVIAN>
+vds <vds@VIVIAN> vds <vds@vivian>
 Ville M. Vainio <vivainio@gmail.com> <vivainio2@WN-W0941>
 Ville M. Vainio <vivainio@gmail.com> ville <ville@VILLE-PC>
 Ville M. Vainio <vivainio@gmail.com> ville <ville@ville-desktop>
 Ville M. Vainio <vivainio@gmail.com> vivainio <>
+Ville M. Vainio <vivainio@gmail.com> Ville M. Vainio <vivainio@villev>
+Ville M. Vainio <vivainio@gmail.com> Ville M. Vainio <vivainio@ville_vmw>
 Walter Doerwald <walter@livinglogic.de> walter.doerwald <>
+Walter Doerwald <walter@livinglogic.de> Walter Doerwald <>
+W. Trevor King <wking@tremily.us> W. Trevor King <wking@drexel.edu>