diff --git a/.authorspellings b/.authorspellings
deleted file mode 100644
index 5a328a84..00000000
--- a/.authorspellings
+++ /dev/null
@@ -1,80 +0,0 @@
-Alejandro Serrano Mena <trupill@gmail.com>, trupill@gmail.com
-Alexandre Buisse <buisse@cs.chalmers.se>, buisse@cs.chalmers.se
-Audun Skaugen <audun@skaugen.name>, Audun Skaugen <audunskaugen@gmail.com>, audunskaugen@gmail.com
-Bas van Dijk <v.dijk.bas@gmail.com>, v.dijk.bas@gmail.com
-Ben Boeckel <mathstuf@gmail.com>, mathstuf@gmail.com
-Brandon S Allbery KF8NH <allbery.b@gmail.com>, allbery@ece.cmu.edu
-Brent Yorgey <byorgey@cis.upenn.edu>, Brent Yorgey <byorgey@gmail.com>
-Carlos Lopez-Camey <c.lopez@kmels.net>, c.lopez@kmels.net
-Carsten Otto <xmonad@c-otto.de>, xmonad@c-otto.de
-Christian Dietrich <stettberger@dokucode.de>, stettberger@dokucode.de
-Daniel Neri <daniel.neri@sigicom.com>, Daniel Neri <daniel.neri@sigicom.se>
-Daniel Schoepe <daniel.schoepe@googlemail.com>, Daniel Schoepe <daniel.schoepe@gmail.com>, Daniel Schoepe <asgaroth_@gmx.de>
-Daniel Wagner <daniel@wagner-home.com>, daniel@wagner-home.com
-Dave Harrison <dave@nullcube.com>, dave@nullcube.com
-David Glasser <glasser@mit.edu>, glasser@mit.edu
-David McLean <gopsychonauts@gmail.com>, gopsychonauts@gmail.com
-Dominik Bruhn <dominik@dbruhn.de>, dominik@dbruhn.de
-Don Stewart <dons00@gmail.com>, Don Stewart <dons@cse.unsw.edu.au>, Don Stewart <dons@galois.com>
-Gwern Branwen <gwern0@gmail.com>, gwern0@gmail.com
-Henrique Abreu <hgabreu@gmail.com>, `Henrique Abreu <hgabreu@gmail.com>'
-Ilya Portnov <portnov84@rambler.ru>, portnov84@rambler.ru
-intrigeri <intrigeri@boum.org>, intrigeri@boum.org
-Ivan Miljenovic <Ivan.Miljenovic@gmail.com>, Ivan.Miljenovic@gmail.com
-Jan-David Quesel <quesel@informatik.uni-oldenburg.de>, quesel@informatik.uni-oldenburg.de
-Jeremy Apthorp <nornagon@gmail.com>, nornagon@gmail.com
-Joachim Breitner <mail@joachim-breitner.de>, mail@joachim-breitner.de
-Joachim Fasting <joachim.fasting@gmail.com>, joachim.fasting@gmail.com
-Joel Suovaniemi <joel.suovaniemi@iki.fi>, joel.suovaniemi@iki.fi
-Joe Thornber <joe.thornber@gmail.com>, joe.thornber@gmail.com
-Johann Giwer <johanngiwer@web.de>, johanngiwer@web.de  
-Jussi Maki <joamaki@gmail.com>, joamaki@gmail.com
-kedals0 <kedals0@gmail.com>, kedals0@gmail.com
-Konstantin Sobolev <konstantin.sobolev@gmail.com>, konstantin.sobolev@gmail.com
-Lanny Ripple <lan3ny@gmail.com>, lan3ny@gmail.com
-Leonardo Serra <leoserra@minaslivre.org>, leoserra@minaslivre.org
-lithis <xmonad@selg.hethrael.org>, xmonad@selg.hethrael.org, xmonad@s001.hethrael.com
-Luis Cabellos <zhen.sydow@gmail.com>, zhen.sydow@gmail.com
-Lukas Mai <l.mai@web.de>, l.mai@web.de
-Mario Pastorelli <pastorelli.mario@gmail.com>, pastorelli.mario@gmail.com
-Mathias Stearn <redbeard0531@gmail.com>, redbeard0531@gmail.com
-Matt Brown <deadguysfrom@gmail.com>, deadguysfrom@gmail.com
-Nelson Elhage <nelhage@mit.edu>, nelhage@mit.edu
-Nicolas Dudebout <nicolas.dudebout@gatech.edu>, nicolas.dudebout@gatech.edu
-Nicolas Pouillard <nicolas.pouillard@gmail.com>, nicolas.pouillard@gmail.com
-Nils Schweinsberg <mail@n-sch.de>, mail@n-sch.de
-Norbert Zeh <nzeh@cs.dal.ca>, nzeh@cs.dal.ca
-Quentin Moser <moserq@gmail.com>, moserq@gmail.com        
-Quentin Moser <quentin.moser@unifr.ch>, quentin.moser@unifr.ch
-Rickard Gustafsson <acura@allyourbase.se>, acura@allyourbase.se
-Robert Marlow <bobstopper@bobturf.org>, bobstopper@bobturf.org, robreim@bobturf.org
-Rohan Jain <crodjer@gmail.com>, crodjer@gmail.com
-Sean Escriva <sean.escriva@gmail.com>, sean.escriva@gmail.com
-Spencer Janssen <spencerjanssen@gmail.com>, sjanssen@cse.unl.edu
-Tomohiro Matsuyama <matsuyama3@ariel-networks.com>, matsuyama3@ariel-networks.com
-Tom Rauchenwald <its.sec@gmx.net>, <its.sec@gmx.net>
-Tony Morris <haskell@tmorris.net>, haskell@tmorris.net
-Valery V. Vorotyntsev <valery.vv@gmail.com>, valery.vv@gmail.com
-Will Farrington <wcfarrington@gmail.com>, wcfarrington@gmail.com
-Wirt Wolff <wirtwolff@gmail.com>, wirtwolff@gmail.com
-Yaakov Nemoy <loupgaroublond@gmail.com>, loupgaroublond@gmail.com
-timthelion <tim.thelion@gmail.com>, tim.thelion@gmail.com
-seanmce33 <seanmce33@gmail.com>, seanmce33@gmail.com
-rupa <rupa@lrrr.us>, rupa@lrrr.us
-perlkat <perlkat@katspace.org>, perlkat@katspace.org
-longpoke <longpoke@gmail.com>, longpoke@gmail.com
-cardboard42 <cardboard42@gmail.com>, cardboard42@gmail.com
-daedalusinfinity <daedalusinfinity@gmail.com>, daedalusinfinity@gmail.com
-Jens Petersen <juhp@community.haskell.org>, Jens Petersen <petersen@haskell.org>
-
-Neil Mitchell <http://www.cs.york.ac.uk/~ndm/>, Neil Mitchell
-Nick Burlett <nickburlett@mac.com>, nickburlett@mac.com
-Sam Hughes   <hughes@rpi.edu>, hughes@rpi.edu
-Shae Erisson <shae@ScannedInAvian.com>, shae@ScannedInAvian.com
-Conrad Irwin <conrad.irwin@gmail.com>, conrad.irwin@gmail.com
-
--- unknown:
--- xmonad-contrib@hexago.nl
--- brian@lorf.org
--- jakob@pipefour.org
-
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..c11f2812
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,100 @@
+Alejandro Serrano Mena <trupill@gmail.com>
+Alexandre Buisse <buisse@cs.chalmers.se>
+Anders Engstrom <ankaan@gmail.com>
+Antoine R. Dumont <eniotna.t@gmail.com>
+Anton Pirogov <anton.pirogov@gmail.com>
+Anton Pirogov <anton.pirogov@gmail.com> anton.pirogov at gmail . com <unknown>
+Arjun Comar <nrujac@gmail.com>
+Audun Skaugen <audun@skaugen.name> <audunskaugen@gmail.com>
+Bas van Dijk <v.dijk.bas@gmail.com>
+Ben Boeckel <mathstuf@gmail.com>
+Ben Weitzman <benweitzman@gmail.com>
+Brandon S Allbery KF8NH <allbery.b@gmail.com>
+Brandon S Allbery KF8NH <allbery.b@gmail.com> <allbery@ece.cmu.edu>
+Brent Yorgey <byorgey@gmail.com> <byorgey@cis.upenn.edu>
+Carlos Lopez-Camey <c.lopez@kmels.net>
+Carsten Otto <xmonad@c-otto.de>
+Christian Dietrich <stettberger@dokucode.de>
+Christian Wills <cwills.dev@gmail.com>
+Daniel Neri <daniel.neri@sigicom.com> <daniel.neri@sigicom.se>
+Daniel Schoepe <daniel.schoepe@googlemail.com> <asgaroth_@gmx.de>
+Daniel Schoepe <daniel.schoepe@googlemail.com> <daniel.schoepe@gmail.com>
+Daniel Wagner <me@dmwit.com> <daniel@wagner-home.com>
+Dave Harrison <dave@nullcube.com>
+David Glasser <glasser@mit.edu>
+David McLean <gopsychonauts@gmail.com>
+Devin Mullins <devin.mullins@gmail.com> <me@twifkak.com>
+Dominik Bruhn <dominik@dbruhn.de>
+Don Stewart <dons00@gmail.com> <dons@cse.unsw.edu.au>
+Don Stewart <dons00@gmail.com> <dons@galois.com>
+Edward Z. Yang <ezyang@cs.stanford.edu>
+Gwern Branwen <gwern@gwern.net>
+Gwern Branwen <gwern@gwern.net> <gwern0@gmail.com>
+Henrique Abreu <hgabreu@gmail.com>
+Ilya Portnov <portnov84@rambler.ru>
+intrigeri <intrigeri@boum.org>
+Ivan Miljenovic <Ivan.Miljenovic@gmail.com>
+Jan-David Quesel <quesel@informatik.uni-oldenburg.de>
+Jens Petersen <juhp@community.haskell.org> <petersen@haskell.org>
+Jeremy Apthorp <nornagon@gmail.com>
+Joachim Breitner <mail@joachim-breitner.de>
+Joachim Fasting <joachim.fasting@gmail.com>
+Joel Suovaniemi <joel.suovaniemi@iki.fi>
+Joe Thornber <joe.thornber@gmail.com>
+Johann Giwer <johanngiwer@web.de>
+Jussi Maki <joamaki@gmail.com>
+Konstantin Sobolev <konstantin.sobolev@gmail.com>
+Lanny Ripple <lan3ny@gmail.com>
+Lei Chen <linxray@gmail.com>
+Leonardo Serra <leoserra@minaslivre.org>
+Luis Cabellos <zhen.sydow@gmail.com>
+Lukas Mai <l.mai@web.de>
+Mario Pastorelli <pastorelli.mario@gmail.com>
+Mathias Stearn <redbeard0531@gmail.com>
+Matt Brown <deadguysfrom@gmail.com>
+Matthew Hague <matthewhague@zoho.com>
+Nathaniel Filardo <nwfilardo@gmail.com>
+Nelson Elhage <nelhage@mit.edu>
+Nicolas Dudebout <nicolas.dudebout@gatech.edu>
+Nicolas Pouillard <nicolas.pouillard@gmail.com>
+Nils Schweinsberg <mail@n-sch.de>
+Norbert Zeh <nzeh@cs.dal.ca>
+Peter Olson <polson2@hawk.iit.edu>
+Quentin Moser <moserq@gmail.com>
+Quentin Moser <quentin.moser@unifr.ch>
+Rickard Gustafsson <acura@allyourbase.se>
+Robert Marlow <bobstopper@bobturf.org>
+Robert Marlow <bobstopper@bobturf.org> <robreim@bobturf.org>
+Rohan Jain <crodjer@gmail.com>
+Sean Escriva <sean.escriva@gmail.com>
+Sean McEligot <seanmce33@gmail.com>
+Spencer Janssen <spencerjanssen@gmail.com> <sjanssen@cse.unl.edu>
+Tomohiro Matsuyama <matsuyama3@ariel-networks.com>
+Tom Rauchenwald <its.sec@gmx.net>
+Tony Morris <haskell@tmorris.net>
+Valery V. Vorotyntsev <valery.vv@gmail.com>
+Will Farrington <wcfarrington@gmail.com>
+Wirt Wolff <wirtwolff@gmail.com>
+Yaakov Nemoy <loupgaroublond@gmail.com>
+
+brian <brian@lorf.org>
+cardboard42 <cardboard42@gmail.com>
+daedalusinfinity <daedalusinfinity@gmail.com>
+hexago.nl <xmonad-contrib@hexago.nl>
+intrigeri <intrigeri@boum.org>
+jakob <jakob@pipefour.org>
+kedals0 <kedals0@gmail.com>
+lithis <xmonad@selg.hethrael.org>
+lithis <xmonad@selg.hethrael.org> <xmonad@s001.hethrael.com>
+longpoke <longpoke@gmail.com>
+md143rbh7f <md143rbh7f@gmail.com>
+perlkat <perlkat@katspace.org>
+rupa <rupa@lrrr.us> <rupa@lrrr.us>
+timthelion <tim.thelion@gmail.com>
+
+# for core only
+Neil Mitchell <http://www.cs.york.ac.uk/~ndm/>, Neil Mitchell
+Nick Burlett <nickburlett@mac.com>
+Sam Hughes   <hughes@rpi.edu>
+Shae Erisson <shae@ScannedInAvian.com>
+Conrad Irwin <conrad.irwin@gmail.com>