cleaned up and normalized most of the schema
Merge pull request #145 from amida-tech/dmitry-model-fixes

cleaned up and normalized most of the schema