updated gemspec
updated gemfile.lock
Merge branch 'master' of github.com:qoobaa/s3