Bring shika-based up to trunk

diff --cc lib/Mouse.pm
index 2f61610,12e4707..1887893
--- 1/lib/Mouse.pm
--- 2/lib/Mouse.pm
+++ b/lib/Mouse.pm
@@@ -2,24 -2,13 +2,23 @@@
  package Mouse;
  use strict;
  use warnings;
 +use 5.006;
  use base 'Exporter';
  
- our $VERSION;
+ our $VERSION = '0.13';
+ use 5.006;
  
 +BEGIN {
-     $VERSION  = '0.12';
- 
 +    if ($ENV{MOUSE_DEBUG}) {
 +        *DEBUG = sub (){ 1 };
 +    } else {
 +        *DEBUG = sub (){ 0 };
 +    }
 +}
 +
  use Carp 'confess';
 -use Mouse::Util 'blessed';
 +use Scalar::Util 'blessed';
 +use Mouse::Util;
  
  use Mouse::Meta::Attribute;
  use Mouse::Meta::Class;

diff --cc t/017-default-reference.t
index 41d2593,73c4c7c..8d1a354
--- 1/t/017-default-reference.t
--- 2/t/017-default-reference.t
+++ b/t/017-default-reference.t
@@@ -1,8 -1,8 +1,8 @@@
  #!/usr/bin/env perl
  use strict;
  use warnings;
- use Test::More tests => 8;
+ use Test::More tests => 9;
 -use Mouse::Util ':test';
 +use Test::Exception;
  
  do {
      package Class;

diff --cc t/025-more-isa.t
index 132d57f,73ba022..e59ef90
--- 1/t/025-more-isa.t
--- 2/t/025-more-isa.t
+++ b/t/025-more-isa.t
@@@ -1,8 -1,8 +1,8 @@@
  #!/usr/bin/env perl
  use strict;
  use warnings;
- use Test::More tests => 29;
+ use Test::More tests => 30;
 -use Mouse::Util ':test';
 +use Test::Exception;
  
  do {
      package Class;