Handle new zones, zones being deleted better

Also always dump the pickle so that any errors in the script will not
result in huge spikes.

Change-Id: I87122152237388f7f58d6281bf5deff56cd4326d