Merge branch 'master' into psgi

master:
Stop passing along @INC
Use the proper way of setting @INC for tests
Aggregate http-server.t tests
Allow aggregating specific tests only
Use the harness instead of all of prove
Make the no-tabs test happy again

diff --cc Makefile.PL
index cb27dfe,8dbd962..c016f5a
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -60,14 -55,15 +60,16 @@@ requires 'Plack::Middleware::ReversePro
  test_requires 'Class::Data::Inheritable';
  test_requires 'Test::Exception';
  test_requires 'Test::More' => '0.88';
 +test_requires 'Data::Dump';
  
  # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
- if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.35_05')) {
-     author_requires('Test::Aggregate', '0.35_05');
+ if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.364')) {
+     author_requires('Test::Aggregate', '0.364');
      author_requires('Test::Simple', '0.88');
+     open my $fh, '>', '.aggregating';
  }
  else {
+     unlink '.aggregating';
      tests join q{ },
          grep { $_ ne 't/aggregate.t' }
          map  { glob } qw[t/*.t t/aggregate/*.t];