Update to match recent Pupa changes.
Merge branch 'master' of github.com:opencivicdata/opencivicdata