Some tweaks to simulation mode
Merge branch 'master' of github.com:jgilbert20/sensornet