fixed requires and manifest

Manifest.txt

@@ -7,6 +7,9 @@ TODO.txt
 init.rb
 install.rb
 lib/webrat.rb
+lib/webrat/core_extensions/blank.rb
+lib/webrat/core_extensions/hash_with_indifferent_access.rb
+lib/webrat/core_extensions/nil_to_param.rb
 lib/webrat/core.rb
 lib/webrat/core/area.rb
 lib/webrat/core/assertions.rb
@@ -24,8 +27,6 @@ lib/webrat/core/url_encoded_pair_parser.rb
 lib/webrat/mechanize.rb
 lib/webrat/mechanize/mechanize_session.rb
 lib/webrat/merb.rb
-lib/webrat/merb/indifferent_access.rb
-lib/webrat/merb/support.rb
 lib/webrat/rack/rack_session.rb
 lib/webrat/rails.rb
 lib/webrat/rails/rails_session.rb
@@ -40,10 +41,6 @@ lib/webrat/selenium/location_strategy_javascript/webratlinkwithin.js
 lib/webrat/selenium/location_strategy_javascript/webratselectwithoption.js
 lib/webrat/selenium/selenium_session.rb
 lib/webrat/sinatra/sinatra_session.rb
-manifest.diff
-mechanize_spike.rb
-selenium_spike.rb
-spec/api/attaches_file_spec.rb
 spec/api/basic_auth_spec.rb
 spec/api/checks_spec.rb
 spec/api/chooses_spec.rb
@@ -53,14 +50,12 @@ spec/api/clicks_link_spec.rb
 spec/api/fills_in_spec.rb
 spec/api/reloads_spec.rb
 spec/api/save_and_open_spec.rb
-spec/api/selects_date_spec.rb
 spec/api/selects_spec.rb
 spec/api/should_not_see_spec.rb
 spec/api/should_see_spec.rb
 spec/api/visits_spec.rb
 spec/api/within_spec.rb
 spec/fakes/test_session.rb
-spec/integration/rails_spec.rb
 spec/rcov.opts
 spec/spec_helper.rb
 spec/webrat/core/logging_spec.rb

lib/webrat/core.rb

@@ -1,5 +1,6 @@
 require "webrat/core/logging"
 require "webrat/core/flunk"
+require "webrat/core/param_parser"
 require "webrat/core/form"
 require "webrat/core/scope"
 require "webrat/core/link"

lib/webrat/core/field.rb

@@ -1,7 +1,6 @@
 require "cgi"
 require "webrat/core_extensions/blank"
 require "webrat/core_extensions/nil_to_param"
-require "webrat/merb/param_parser"
 
 module Webrat
   class Field

lib/webrat/core/param_parser.rb

@@ -1,6 +1,6 @@
 require "cgi"
 require "webrat/core_extensions/blank"
-require "webrat/merb/url_encoded_pair_parser"
+require "webrat/core/url_encoded_pair_parser"
 
 module Webrat
   class ParamParser