mailmap: Christian Marie affiliation

and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>