Fix to zip to make it properly getIterator compliant. Various other functions now return container wrappers rather than raw STL containers.