Use cities1000 in test_project
Merge /home/jpic/env/src/cities-light

Conflicts:
	test_project/test_project/settings.py
Py3 style import
Merge /home/jpic/env3/src/cities-light
Added --traceback to test.sh