Merge pull request #1 from nigelgbanks/7.x-code-review

HOCR can now parse highlighted solr request.
Merge pull request #5 from adam-vessey/7.x

Move more code in, to be called from elsewhere.