This commit updates the mailmap file and changes my alias
in a few places within old comments.
Update mailmap to reflect that I am committing from a new email address.
The .mailmap feature is used to coalesce together commits by the same
person in the shortlog, where their name and/or email address was