Update mail map
Update CONTRIBUTORS