mailmap updates & fixes.

.mailmap

@@ -3,6 +3,7 @@ Eli Barzilay        <[email protected]>         <[email protected]>
 Eli Barzilay        <[email protected]>         <[email protected]>
 Kevin Tew           <[email protected]>        <[email protected]>
 Sam Tobin-Hochstadt <[email protected]>       <[email protected]>
+Sam Tobin-Hochstadt <[email protected]>       <[email protected]>
 Vincent St-Amour    <[email protected]>    <[email protected]>
 James Swaine        <[email protected]> <[email protected]>
 Jens Axel Soegaard  <[email protected]>    <[email protected]>
@@ -16,24 +17,28 @@ Kathy Gray          <[email protected]>      <[email protected]>
 Kathy Gray          <[email protected]>      <[email protected]>
 Matthias Felleisen  <[email protected]>    <[email protected]>
 Robby Findler       <[email protected]>       <[email protected]>
-Jon Rafkind         <[email protected]>     <jon@jon-laptop.(none)>
+Jon Rafkind         <[email protected]>     jon <jon@jon-laptop.(none)>
 Stephen Chang       <[email protected]>     <[email protected]>
+Stephen Chang       <[email protected]>     <[email protected]>
 Asumu Takikawa      <[email protected]>       <[email protected]>
 Asumu Takikawa      <[email protected]>       <[email protected]>
 Guillaume Marceau   <[email protected]>    <[email protected]>
 Danny Yoo           <[email protected]>        <[email protected]>
 Danny Yoo           <[email protected]>        <[email protected]>
 Philippe Meunier    <[email protected]>     <[email protected]>
 David Van Horn      <[email protected]>    <[email protected]>
+Christos Dimoulas   <[email protected]>
+Eric Dobson         <[email protected]>    <[email protected]>
+Eric Dobson         <[email protected]>    <[email protected]>
 
 # Additional people
-Eric Dobson      <eric.n.dobson@gmail.com>    <[email protected]>
-Gregory Cooper   <[email protected]>
-Gregory Cooper   <[email protected]>         <[email protected].edu>
-J. Ian Johnson   <[email protected]>           <ianj@bubbles.ccs.neu.edu>
-J. Ian Johnson   <[email protected]>           <[email protected]>
-Michael Wilber   <[email protected]>
-Rodolfo Carvalho <[email protected]>
-Steven Jaconette <[email protected]> <[email protected]>
-Tim Brown        <[email protected]>               <[email protected]>
+Gregory Cooper    <ghcooper@gmail.com>
+Gregory Cooper    <[email protected]>         <[email protected]>
+J. Ian Johnson    <[email protected]>           <[email protected].edu>
+J. Ian Johnson    <[email protected]>           <ianj@moonpatrol.ccs.neu.edu>
+Michael Wilber    <[email protected]>       <[email protected]>
+Michael Filonenko <[email protected]> <[email protected]>
+Rodolfo Carvalho  <[email protected]>
+Steven Jaconette  <[email protected]> <[email protected]>
+Tim Brown         <[email protected]>               <[email protected]>
 Marc Burns <[email protected]> Marc Burns <[email protected]>