Don't clash with builtins when testing, set debug to false for tests
Merge branch 'dev' into hughdbrown

Conflicts:
	discern/test_settings.py
	freeform_data/tests.py