get all the rackspace files specs passing

lib/fog/rackspace/files.rb

@@ -56,7 +56,7 @@ module Fog
           :expects  => params[:expects],
           :headers  => {
             'X-Auth-Token' => @auth_token
-          },
+          }.merge!(params[:headers] || {}),
           :host     => @cdn_host,
           :method   => params[:method],
           :path     => "#{@cdn_path}/#{params[:path]}",
@@ -74,7 +74,7 @@ module Fog
           :expects  => params[:expects],
           :headers  => {
             'X-Auth-Token' => @auth_token
-          },
+          }.merge!(params[:headers] || {}),
           :host     => @storage_host,
           :method   => params[:method],
           :path     => "#{@storage_path}/#{params[:path]}",

spec/rackspace/requests/files/put_object_spec.rb

@@ -8,7 +8,7 @@ describe 'Rackspace::Files.put_object' do
     end
     
     after(:each) do
-      files.delete_object('object_name')
+      files.delete_object('container_name', 'object_name')
       files.delete_container('container_name')
     end