Per airbnb request, use a separate json field for time zone

Also updated to a current version of scala
Nit: right most `|` is not aligned.