Refreshed NZ data and added new measures
Updated makejson for new NZ data
Refreshed and added US data