Update .mailmap and AUTHORS

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Merge pull request #3926 from tianon/update-mailmap

Update .mailmap and AUTHORS