Merge trunk into here, fix tests to pass again with the newer versions of Plack

diff --cc Makefile.PL
index 828c2ab,3b2305c..b34d724
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -21,8 -19,7 +19,8 @@@ requires 'namespace::clean' => '0.13'
  requires 'B::Hooks::EndOfScope' => '0.08';
  requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903';
  requires 'Class::MOP' => '0.95';
 +requires 'Data::OptList';
- requires 'Moose' => '0.93';
+ requires 'Moose' => '1.03';
  requires 'MooseX::MethodAttributes::Inheritable' => '0.19';
  requires 'MooseX::Role::WithOverloading' => '0.05';
  requires 'Carp';

diff --cc lib/Catalyst.pm
Simple merge

diff --cc lib/Catalyst/Engine.pm
Simple merge

diff --cc lib/Catalyst/ScriptRole.pm
index e36ca2f,535ed3d..4d93e57
--- 1/lib/Catalyst/ScriptRole.pm
--- 2/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@@ -3,7 -3,6 +3,7 @@@ use Moose::Role
  use MooseX::Types::Moose qw/Str Bool/;
  use Pod::Usage;
  use MooseX::Getopt;
++use Plack::Loader;
  use namespace::autoclean;
  
  with 'MooseX::Getopt' => {

diff --cc lib/Catalyst/Test.pm
Simple merge

diff --cc t/aggregate/unit_core_script_cgi.t
index f39e377,ba187e1..ffadb8a
--- 1/t/aggregate/unit_core_script_cgi.t
--- 2/t/aggregate/unit_core_script_cgi.t
+++ b/t/aggregate/unit_core_script_cgi.t
@@@ -15,8 -15,6 +15,8 @@@ lives_ok 
      Catalyst::Script::CGI->new_with_options(application_name => 'TestAppToTestScripts')->run;
  } "new_with_options";
  shift @TestAppToTestScripts::RUN_ARGS;
- my $server = shift @TestAppToTestScripts::RUN_ARGS;
- like ref($server), qr/^Plack::Server/, 'Is a Plack Server';
++my $server = pop @TestAppToTestScripts::RUN_ARGS;
++like ref($server), qr/^Plack::Handler/, 'Is a Plack::Handler';
  is_deeply \@TestAppToTestScripts::RUN_ARGS, [], "no args";
  
  done_testing;

diff --cc t/aggregate/unit_core_script_fastcgi.t
index 01e4339,b5d3ea4..ef3d007
--- 1/t/aggregate/unit_core_script_fastcgi.t
--- 2/t/aggregate/unit_core_script_fastcgi.t
+++ b/t/aggregate/unit_core_script_fastcgi.t
@@@ -51,8 -51,6 +51,8 @@@ sub testOption 
      } "new_with_options";
      # First element of RUN_ARGS will be the script name, which we don't care about
      shift @TestAppToTestScripts::RUN_ARGS;
-     my $server = shift @TestAppToTestScripts::RUN_ARGS;
-     like ref($server), qr/^Plack::Server/, 'Is a Plack Server';
++    my $server = pop @TestAppToTestScripts::RUN_ARGS;
++    like ref($server), qr/^Plack::Handler/, 'Is a Plack::Handler';
      is_deeply \@TestAppToTestScripts::RUN_ARGS, $resultarray, "is_deeply comparison";
  }
  

diff --cc t/aggregate/unit_core_script_server.t
index 2508452,b9ad60b..0623cfe
--- 1/t/aggregate/unit_core_script_server.t
--- 2/t/aggregate/unit_core_script_server.t
+++ b/t/aggregate/unit_core_script_server.t
@@@ -89,8 -89,6 +89,8 @@@ sub testOption 
      };
      # First element of RUN_ARGS will be the script name, which we don't care about
      shift @TestAppToTestScripts::RUN_ARGS;
-     my $server = shift @TestAppToTestScripts::RUN_ARGS;
-     like ref($server), qr/^Plack::Server/, 'Is a Plack Server';
++    my $server = pop @TestAppToTestScripts::RUN_ARGS;
++    like ref($server), qr/^Plack::Handler/, 'Is a Plack::Handler';
      # Mangle argv into the options..
      $resultarray->[-1]->{argv} = $argstring;
      is_deeply \@TestAppToTestScripts::RUN_ARGS, $resultarray, "is_deeply comparison " . join(' ', @$argstring);