Land rapid7#5955, .mailmap cleanup

Author: wvu

.mailmap

@@ -1,4 +1,5 @@
 bcook-r7 <bcook-r7@github>         Brent Cook <[email protected]>
+bcook-r7 <bcook-r7@github>         <[email protected]>
 bturner-r7 <bturner-r7@github>     Brandon Turner <[email protected]>
 ccatalan-r7 <ccatalan-r7@github>   Christian Catalan <[email protected]>
 cdoughty-r7 <cdoughty-r7@github>   Chris Doughty <[email protected]>
@@ -11,9 +12,8 @@ farias-r7 <farias-r7@github>       Fernando Arias <[email protected]>
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 jhart-r7 <jhart-r7@github>         Jon Hart <[email protected]>
-jlee-r7 <jlee-r7@github>           James Lee <[email protected]>
-jlee-r7 <jlee-r7@github>           James Lee <[email protected]> # aka egypt
-jlee-r7 <jlee-r7@github>           egypt <[email protected]> # aka egypt
+jlee-r7 <jlee-r7@github>           <[email protected]>
+jlee-r7 <jlee-r7@github>           <[email protected]> # aka egypt
 jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
 jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
 kgray-r7 <kgray-r7@github>         Kyle Gray <[email protected]>
@@ -37,9 +37,8 @@ todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
 todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
 trosen-r7 <trosen-r7@github>       Trevor Rosen <[email protected]>
 trosen-r7 <trosen-r7@github>       Trevor Rosen <[email protected]>
-wchen-r7 <wchen-r7@github>         Wei Chen <[email protected]>
-wchen-r7 <wchen-r7@github>         sinn3r <[email protected]> # aka sinn3r
-wchen-r7 <wchen-r7@github>         sinn3r <[email protected]>
+wchen-r7 <wchen-r7@github>         <[email protected]> # aka sinn3r
+wchen-r7 <wchen-r7@github>         <[email protected]>
 wvu-r7 <wvu-r7@github>             William Vu <[email protected]>
 wvu-r7 <wvu-r7@github>             William Vu <[email protected]>
 wvu-r7 <wvu-r7@github>             William Vu <[email protected]>
@@ -73,18 +72,18 @@ efraintorres <efraintorres@github>     efraintorres <[email protected]>
 efraintorres <efraintorres@github>     et <>
 fab <fab@???>                          fab <> # fab at revhosts.net (Fabrice MOURRON)
 FireFart <FireFart@github>             Christian Mehlmauer <[email protected]>
+FireFart <FireFart@github>             <[email protected]>
 h0ng10 <h0ng10@github>                 h0ng10 <[email protected]>
 h0ng10 <h0ng10@github>                 Hans-Martin Münch <[email protected]>
-jcran <jcran@github>                   Jonathan Cran <[email protected]>
-jcran <jcran@github>                   Jonathan Cran <[email protected]>
-jduck <jduck@github>                   Joshua Drake <[email protected]>
+jcran <jcran@github>                   <[email protected]>
+jcran <jcran@github>                   <[email protected]>
+jcran <jcran@github>                   <[email protected]>
+jcran <jcran@github>                   <[email protected]>
+jduck <jduck@github>                   <[email protected]>
+jduck <jduck@github>                   <[email protected]>
 jgor <jgor@github>                     jgor <[email protected]>
-joevennix <joevennix@github>           joe <[email protected]>
-joevennix <joevennix@github>           Joe Vennix <[email protected]>
-joevennix <joevennix@github>           Joe Vennix <[email protected]>
-joevennix <joevennix@github>           joev <[email protected]>
-joevennix <joevennix@github>           jvennix-r7 <[email protected]>
-joevennix <joevennix@github>           jvennix-r7 <[email protected]>
+joevennix <joevennix@github>           <[email protected]>
+joevennix <joevennix@github>           <[email protected]>
 kernelsmith <kernelsmith@github>       Joshua Smith <[email protected]>
 kernelsmith <kernelsmith@github>       Joshua Smith <[email protected]>
 kernelsmith <kernelsmith@github>       kernelsmith <kernelsmith@kernelsmith>
@@ -94,18 +93,17 @@ m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 m-1-k-3 <m-1-k-3@github>               Michael Messner <[email protected]>
-Meatballs1 <Meatballs1@github>         Ben Campbell <[email protected]>
-Meatballs1 <Meatballs1@github>         Meatballs <[email protected]>
-Meatballs1 <Meatballs1@github>         Meatballs1 <[email protected]>
+Meatballs1 <Meatballs1@github>         <[email protected]>
+Meatballs1 <Meatballs1@github>         <[email protected]>
 mubix <mubix@github>                   Rob Fuller <[email protected]>
 nevdull77 <nevdull77@github>           Patrik Karlsson <[email protected]>
 nmonkee <nmonkee@github>               nmonkee <[email protected]>
 nullbind <nullbind@github>             nullbind <[email protected]>
 nullbind <nullbind@github>             Scott Sutherland <[email protected]>
 ohdae <ohdae@github>                   ohdae <[email protected]>
-oj <oj@github>                         OJ <[email protected]>
-oj <oj@github>                         OJ Reeves <[email protected]>
+oj <oj@github>                         <[email protected]>
 r3dy <r3dy@github>                     Royce Davis <[email protected]>
+r3dy <r3dy@github>                     Royce Davis <[email protected]>
 r3dy <r3dy@github>                     Royce Davis <[email protected]>
 Rick Flores <[email protected]>  Rick Flores (nanotechz9l) <[email protected]>
 rsmudge <rsmudge@github>               Raphael Mudge <[email protected]> # Aka `butane
@@ -116,8 +114,7 @@ skape <skape@???>                      Matt Miller <[email protected]>
 spoonm <spoonm@github>                 Spoon M <[email protected]>
 swtornio <swtornio@github>             Steve Tornio <[email protected]>
 Tasos Laskos <[email protected]> Tasos Laskos <[email protected]>
-timwr <timwr@github>                   Tim <[email protected]>
-timwr <timwr@github>                   Tim Wright <[email protected]>
+timwr <timwr@github>                   <[email protected]>
 TomSellers <TomSellers@github>         Tom Sellers <[email protected]>
 TrustedSec <[email protected]>      trustedsec <[email protected]>
 zeroSteiner <zeroSteiner@github>       Spencer McIntyre <[email protected]>