use request pathname for content-type and charset
Merge remote-tracking branch 'origin/jasonsanjose/middleware' into html-highlight-merge
Hookup highlighting