Merge branch 'master' of https://github.com/searchbox-io/django-haystack-sample

Conflicts:
	django_haystack_sample/settings.py
	requirements.txt