Fixes #25, bill city in ETL
Merge pull request #26 from jgunderson/25-billcity

Fixes #25, bill city in ETL