New snippet highlighting facility

* Generates snippets and highlights matches.

* Adds demo.
Minor clean-up