manual dependency update with pinned foreman
Use rspec 3 syntax
Tell rspec to work out the kind of spec from file location
Remove blank specs
Use fork html-rspec-matchers so we can load it.

Main branch tries to load it into cucumber before it’s loaded.
We only want to use it in RSpec
don't use git@ in Gemfile
Merge branch 'master' into update-dependencies

Conflicts:
	Gemfile.lock
	spec/models/organization_spec.rb
minor dep updates
Allow rackspace connections further up the chain
Revert "Allow rackspace connections further up the chain"

This reverts commit ccf5271bf223b6c6ab97b13b6fedb24295fddc23.
Don't autorequire vcr and webmock
Update rackspace api key
Pin carrierwave
Revert "Pin carrierwave"

This reverts commit 73eedf77396df0697e861d8c46dbd4f1b8dc1469.
be_true expects thing to respond to .true?
Fix deprecated matcher
new expectation syntax for rspec
new expectation syntax
rspec syntax updates
Merge pull request #323 from theodi/update-dependencies

manual dependency update with pinned foreman