Deal with how errors are displayed in the state space
Fixed escaping of event names so that $initialise_machine and $setup_constants are correctly ignored (the conditional was wrong)
Merge remote-tracking branch 'origin/develop' into develop