Added some state saving, restoring, and fossil

collection tests with some minor fixes. I also
added a restoreState method to the ObjectState template.
Merge branch 'initial-development' of http://github.com/wilseypa/warped2 into initial-development