Merge in zipf differences from gfio