bcriger/hybrid_simulation — pull request #1 by sjborgdorff (2012-09-29 02:31:10+00:00)
Title: try pulling this

A file was missing from the first version.