Even more message trace flexibility

Next step is to put extra in a new separate annotation field.
Tuple, tuple, tuple
Merge pull request #41 from wajam/manu-trace-extra-map

Even more message trace flexibility