Trigger system improvements 

@AmbientOSX @BrettASwift 
Removed the future call here. Each scenario is firing the previous scenario's onstart triggers in addition to its own.