Functor based Zip instead of CanZip
Merge pull request #64 from gregwebs/zip

Functor based Zip instead of CanZip