Upgraded rubyzip to >= 1.0.0
Fixed merge conflicts
Merge pull request #185 from iron-io/rubyzip-upgrade

Upgraded rubyzip to >= 1.0.0