Fix for Issue #381.  As part of this fix I've removed simulator.py, as it seemed largely redundant with LocalSimulator.java (but was missing some features, leading to this bug).