DNM:mailmap updates

Sure, will update for Dan Mick alone for now.