update schema to stop None entity_type
Merge branch 'master' of github.com:opencivicdata/pupa