Readd .mailmap file
Update README