Extend the .mailmap

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Remove empty TODO

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>