Cleaning up the models.
Propagate model changes to code.
Finish updating models and fixing what broke.
Merge branch 'staging' of github.com:visgence/portcullis into modelFiddle

Conflicts:
	graphs/display_graphs.py