Remove the city census and fix resulting race conditions

Removing references to the city census exposed some race conditions in
the initial data load. I've attempted to fix these, but can't really
tell whether I've broken anything else because the tests are so
broken...

I'll rebase this branch once the tests are in a slightly better shape.