Sync the haddock lexer/parser etc with old hackage

The old hackage-scripts (where we stole the haddock parser from
originally) had been updated fairly recently. Sync up with that.
This should eliminate the discrepancies in the haddock markup
formatting between the old and new hackage.