Error when trying to define a "type" property
Prevent users from using any system-property names in model definitions
Merge branch 'v0.5'

Conflicts:
	lib/index.js