Merge pull request #5 from adam-vessey/7.x

Move more code in, to be called from elsewhere.
documenting HOCR solr config
Merge pull request #8 from willtp87/solrinfo

documenting HOCR solr config
Flip around how we use the provided parameters.

Need to use our values first, as the values provided from the result-
list highlighting can break things.