Did schema-y stuff
Merge branch 'master' of github.com:penman/orm