Added .mailmap to clean up authors
Merge pull request #383 from Yelp/sclark_382_add_mailmap

Added .mailmap to clean up authors