Merge branch 'josephholsten'

Conflicts:
	tests/compute/requests/bluebox/block_tests.rb

lib/fog/core/collection.rb

@@ -94,6 +94,7 @@ module Fog
     end
 
     def new(attributes = {})
+      raise ArgumentError, "Initialization parameters must be an attributes hash, got #{attributes.inspect}" unless attributes.respond_to? :merge
       model.new(
         attributes.merge(
           :collection => self,