tests pass now. More work on search results truncating
fail better when lock files exist.
Merge branch 'moz_inv2' of github.com:uberj/mozilla_inventory into moz_inv2

Conflicts:
	core/search/views.py