.mailmap: Consolidate entries for Andy and Greg
.mailmap: Consolidate entries for Andy and Greg

See MAPPING AUTHORS in git-shortlog(1) for details on .mailmap.

For both authors I've selected the email address that they've used
most recently.

easyreporting/fmri_reporting,easyreporting/fmri_reporting,easyreporting/fmri_reporting,easyreporting/fmri_reporting,easyreporting/fmri_reporting,easyreporting/fmri_reporting