Update CREDITS and .mailmap