Tweaked requires and such.

lib/httparty.rb

@@ -1,14 +1,10 @@
+$:.unshift(File.dirname(__FILE__))
+
 require 'net/http'
 require 'net/https'
-require 'uri'
 require 'rubygems'
 require 'active_support'
-
-dir = File.dirname(__FILE__)
-$:.unshift(dir) unless $:.include?(dir) || $:.include?(File.expand_path(dir))
-
 require 'module_level_inheritable_attributes'
-require 'httparty/request'
 
 module HTTParty
   class UnsupportedFormat < StandardError; end
@@ -101,3 +97,5 @@ module HTTParty
     Basement.delete(*args)
   end
 end
+
+require 'httparty/request'

lib/httparty/request.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module HTTParty
   class Request
     # Makes it so uri is sure to parse stuff like google.com without the http

spec/spec_helper.rb

@@ -1,11 +1,6 @@
-begin
+require 'rubygems'
-  require 'spec'
+gem 'rspec'
-rescue LoadError
+require 'spec'
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
-
 require File.join(File.dirname(__FILE__), '..', 'lib', 'httparty')
 
 def file_fixture(filename)