Update .mailmap to correct names and email addresses