[#437] Clean up some imports
Merge pull request #437 from okfn/437-lib-search-imports

lib.search.__init__ messy imports