Addresses the issue I submitted ealier about triggerqueues and waitFor

Fixes a problem with the waitFor(SimulationEntity e) interfering with waitForTrigger(TriggerQueue q).

I also went ahead and renamed the _isWaiting variable to _isWaitedOnBy and made it private to avoid future confusion about what it means.