Fix to work with the recently released Whoosh 2.5.x

In that LockError has moved to a new location, so now we
try to import from the new location, and if that fails, import
from the old.
release 0.9.24