Don't use the production elasticsearch index when running tests
Merge branch 'master' into dev

Conflicts:
	farnsworth/settings.py