Updated Simulation to support class-based models
Merge pull request #578 from jlstevens/master

Updated Simulation to support class-based models.