update email addresses slightly.
Merge pull request #2793 from eviljeff/mktemailaddresstidy

update email addresses slightly.