authors: add two addresses to .mailmap, fix their name in AUTHORS