Update mailmap

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Fix typo in error message

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>