DNM:mailmap updates

The .mailmap must also be updated with
<pre>
Xan Peng &lt;xanpeng@gmail.com> xan &lt;xanpeng@gmail.com>
</pre>
see 8ae942a9d3fb68f292f636d396862e691e5391b9