Merge cleanup changes

- Flake cleanup
- `city` -> `city_id` for compatibility. (as acocunt module loads on travis, travis fails because existing test data uses `city` differently