Changes to simulator. Added stuff and fixed stuff
Merge branch 'master' of https://github.com/jtcb/flock