Mapping some contributors to the same email, fixing jb adresses and trying to
pick the "right" name when 2 are used by the same person
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>