remove the additional condition from the triggers.

Conflicts:
	source/scenario/scenario1b.vwf.yaml
	source/scenario/scenario1e.vwf.yaml
	source/scenario/scenario2e.vwf.yaml
	source/scenario/scenario2f.vwf.yaml
	source/scenario/scenario3a.vwf.yaml
	source/scenario/scenario3c.vwf.yaml
	source/scenario/scenario3e.vwf.yaml
Oops.
Merge pull request #470 from virtual-world-framework/trigger-improvements

Trigger improvements