simulator in master borked?

[Chiradeep Vittal]

I've been working around some issues, but no luck. Primarily the storage 
refactor seems to have bypassed the simulator functionally. Anybody got this to 
work in 4.2? Otherwise I'm going back to 4.1 (!)