Merge pull request #26 from rackerlabs/my-testing-branch

merging fake pull-request
Update README.md
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...
Merge branch 'master' into ui-rework