Review json-schema for datamodel.yaml

See !31.

• Checked for and resolved conflicts
• Reviewed json-schema
• merged or gave back to @salexan