Updated to django 1.7.1, minor code cleanup, revisions to run.py