Fix haystack search
Merge branch 'master' of github.com:artofhuman/django-clever-pages