Fix Whoosh highlighting - thanks @jorgecarleitao

See https://github.com/toastdriven/django-haystack/pull/1002
for the version of this against master.

Updated for the major test refactor in #951