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