Get fog tests running on 1.9.2

Rakefile

@@ -81,7 +81,7 @@ end
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
+  spec.libs << 'lib' << 'spec' << File.expand_path("../", __FILE__)
   spec.spec_opts = ['--colour', "--format", "specdoc"]
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end

spec/spec_helper.rb

@@ -1,16 +1,13 @@
 require 'spec'
 require 'open-uri'
-
-current_directory = File.dirname(__FILE__)
-require "#{current_directory}/../lib/fog"
-require "#{current_directory}/../lib/fog/bin"
+require 'fog'
+require 'fog/bin'
+require 'fog/vcloud/bin'
 
 if ENV["FOG_MOCK"] == "true"
   Fog.mock!
 end
 
-require "#{current_directory}/../lib/fog/vcloud/bin"
-
 module AWS
   class << self
     def [](service)