Changing Schemas to match new data model, and updating references in the relevant files.
Merge pull request #29 from rackerlabs/ModelChange

Changing Schemas to match new data model, and updating references in the...