ISTTT paper changes
encodings file
Merge branch 'master' of https://github.com/ion599/phi

Conflicts:
	django_utils/config.py
	django_utils/experiments/experiment2/database_setup/link_geometry_loader.py
	django_utils/experiments/experiment2/run_experiment.py
	django_utils/orm/load.py