update dot files

- add Pierre's MPI address to .mailmap
- add Makefile.conf to .gitignore

.gitignore

@@ -7,6 +7,7 @@
 /html
 *.aux
 Makefile.coq*
+Makefile.conf
 *.crashcoqide
 *.v#
 *.cache

.mailmap

@@ -21,6 +21,7 @@ Maxime Lesourd <maxime.lesourd@inria.fr> Maxime Lesourd <maxime.lesourd@gmail.co
 Martin Bodin <martin.bodin@inria.fr> Martin Constantino–Bodin <martin.bodin@ens-lyon.org>
 Martin Bodin <martin.bodin@inria.fr> Martin Constantino–Bodin <martin.bodin@inria.fr>
 Pierre Roux <pierre.roux@onera.fr> Pierre Roux <pierre@roux01.fr>
+Pierre Roux <pierre.roux@onera.fr> Pierre Roux <proux@mpi-sws.org>
 Sophie Quinton <sophie.quinton@inria.fr> sophie quinton <squinton@inrialpes.fr>
 Sophie Quinton <sophie.quinton@inria.fr> sophie quinton <sophie.quinton@inria.fr>
 Xiaojie GUO <xiaojie.guo@inria.fr> Xiaojie GUO <gxj0303@loic.inrialpes.fr>
\ No newline at end of file

[Pierre Roux]

@bbb note that Makefile.conf is a leftover from create_makefile.sh, it is not there (and will never be created) in any fresh git clone of Prosa. So I'm not sure we need to add it in .gitignore (although it doesn't hurt).

[Björn Brandenburg]

Oh, ok. I didn't realize that. Well, it doesn't hurt.