Updating readme and adding mailmap
merge