added temporary work branch 20130530
updated simulator.js to take options parameter
updates
various updates