Fix bug in ZipcodeRecord where the city was initialized to the state
Add more output to Spark driver to better match original data generator