Fix emails for Colin Macdonald and Harsh Gupta

.mailmap

@@ -200,8 +200,8 @@ Kaushik Varanasi <kaushik.varanasi1@gmail.com> kaushik94 <kaushik.varanasi1@gmai
 Kalevi Suominen <jksuom@gmail.com> Kalevi Suominen <kalevi.suominen@helsinki.fi>
 Dustin Gadal <Dustin.Gadal@gmail.com> Gadal <Dustin.Gadal@gmail.com>
 Francesco Bonazzi <franz.bonazzi@gmail.com> Francesco Bonazzi <francesco.bonazzi@mpikg.mpg.de>
-Colin B. Macdonald <macdonald@maths.ox.ac.uk> Colin Macdonald <cbm@m.fsf.org>
-Colin B. Macdonald <macdonald@maths.ox.ac.uk> Colin B. Macdonald <cbm@m.fsf.org>
+Colin B. Macdonald <cbm@m.fsf.org> Colin Macdonald <cbm@m.fsf.org>
+Colin B. Macdonald <cbm@m.fsf.org> Colin B. Macdonald <macdonald@maths.ox.ac.uk>
 Chai Wah Wu <cwwuieee@gmail.com> Chai Wah Wu <postvakje@users.noreply.github.com>
 Adam Bloomston <adam@glitterfram.es> Adam Bloomston <mail@adambloomston>
 Alex Lindsay <adlinds3@ncsu.edu> Alex Lindsay <lindsayad@users.noreply.github.com>
@@ -251,6 +251,6 @@ Abhishek Garg <abhishekgarg119@gmail.com> abhishek garg <abhishekgarg119@gmail.c
 Gaurav Dhingra <axyd0000@gmail.com> Gaurav Dhingra <igauravdhingra@protonmail.com>
 Krit Karan <kritkaran.b13@iiits.in> Krit Karan <kritkaran94@users.noreply.github.com>
 Arihant Parsoya <parsoyaarihant@gmail.com> arihant parsoya <parsoyaarihant@gmail.com>
-Harsh Gupta <gupta.harsh96@gmail.com> Harsh Gupta <mail@hargup.in>
+Harsh Gupta <mail@hargup.in> Harsh Gupta <gupta.harsh96@gmail.com>
 Sumith <sumith1896@gmail.com> Sumith1896 <sumith1896@gmail.com>
 Kshitij Saraogi <KshitijSaraogi@gmail.com> kshitij10496 <KshitijSaraogi@gmail.com>

AUTHORS

@@ -289,7 +289,7 @@ Mike Boyle <boyle@astro.cornell.edu>
 Heiner Kirchhoffer <Heiner.Kirchhoffer@gmail.com>
 Pablo Puente <ppuedom@gmail.com>
 James Fiedler <jrfiedler@gmail.com>
-Harsh Gupta <gupta.harsh96@gmail.com>
+Harsh Gupta <mail@hargup.in>
 Tuomas Airaksinen <tuomas.airaksinen@gmail.com>
 Paul Strickland <p.e.strickland@gmail.com>
 James Goppert <james.goppert@gmail.com>
@@ -348,7 +348,7 @@ Peter Brady <petertbrady@gmail.com>
 John V. Siratt <jvsiratt@gmail.com>
 Sarwar Chahal <chahal.sarwar98@gmail.com>
 Nathan Woods <charlesnwoods@gmail.com>
-Colin B. Macdonald <macdonald@maths.ox.ac.uk>
+Colin B. Macdonald <cbm@m.fsf.org>
 Marcus Näslund <naslundx@gmail.com>
 Clemens Novak <clemens@familie-novak.net>
 Mridul Seth <seth.mridul@gmail.com>