Hairlines/Super-annotations plugins + demo

This is a version of the hairlines/super-annotations plugins which works at HEAD.

Fixes #466