Merge branch 'feature-filtering' of https://github.com/ffeldhaus/rOCCI
Merge remote-tracking branch 'upstream/master'
Small changes and fixes in bin/occi behavior

* Removed some useless and annoying messages
* Added restrictions on filter (can be used only with -m)
* 'Connection refused' messages now contain the endpoint
  that refused the connection
Updated DSL and HTTP client spec tests
Temporary fix for #28
Updated and simplified Net::HTTP hack
Merge pull request #39 from arax/client-dev

Updated DSL, bin/occi and tests
Merge branch 'master' of https://github.com/ffeldhaus/rOCCI
Merge pull request #38 from ffeldhaus/master

HTTP Client
Merge remote-tracking branch 'upstream/master'
Updated dependencies

*Bundler now uses occi.gemspec to install all dependencies
*Updated all dependencies
*Resolved jruby-openssl issues (shouldn't be installed on jRuby v1.7+)
*TODO: Update tests to remove deprecated VCR calls
Readme

- added latest gem version badge
Merge remote-tracking branch 'upstream/master'
Fixed formatting in docs
Updated spec tests

* Removed deprecated VCR macros
* Using VCR with RSpec metadata
Merge pull request #40 from arax/master

Updated dependencies
Added Cucumber <-> VCR integration

* All Cucumber features are now VCR-enabled and recorded.
* When adding a new feature, you HAVE TO tag it otherwise
  the tests won't pass! See 'features/support/env.rb' for
  available VCR tags.
Fixed VCR integration with Cucumber

* Using a patched version of VCR 2.4.0
* Removing slashes from cassette names
Updated RSpec tests

* Fully integrated with new VCR using metadata
* Standalone cassette for every testcase
* Updated VCR patches
Fixed should_*_compute_resources cassettes