Merge branch 'master' of https://github.com/ffeldhaus/rOCCI
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
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