Added more email addresses to the .mailmap file.