working on tests
fixing conflicts
centering the data and model schemas
fixing conflicts

Merge branch 'master' of github.com:steve-federowicz/om