Added infinite loop handling to Simulator.
Merge branch 'master' of https://github.com/codecombat/codecombat
Merge branch 'master' of https://github.com/codecombat/codecombat
"Merge branch 'master' of https://github.com/codecombat/codecombat
Simulator handles more errors.