Haddock font lock

Fixes for issue #201