Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!

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

Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!