add zkmap, stringset, get rid of watchzkchildren
Merge branch 'zk_changes' into experimental