Change to entity_type to sync with Bills

This also lets us use the related entity base correctly; bug in hiding.

https://github.com/opencivicdata/pupa/commit/5970d0fada7fe496fb9a9d87f75d27cc6e80cfae