update mailmap

review by @somsnytt, @vladimirnik