Added a mailmap to merge multiple names and update CONTRIBUTORS.