Cleaned up bad imports. Fixes #544
Fixed some references to the bad imports
Merge remote-tracking branch 'torchbox/master' into bad-imports-cleanup

Conflicts:
	wagtail/wagtailembeds/__init__.py
	wagtail/wagtailsearch/__init__.py
Merge pull request #561 from kaedroho/bad-imports-cleanup

Cleaned up bad imports. Fixes #544