Updated Wagtailsearch settings to use new multi backend search
Removed some accidentally commited code (oops)
Merge branch 'master' of github.com:torchbox/wagtaildemo

Conflicts:
	wagtaildemo/settings/production.py
Merge pull request #4 from kaedroho/master

Change wagtailsearch settings to use new settings format