small mailmap update.
I noticed that new emails appeared in some commits and they were treated by git as being written by new people. Also I sorted the modified sections.
EDIT: I guess @jduriez that you have switched your main address?
Edited by Janek Kozicki