Upgrade to KH 3.1.3.1

includes/kohana/modules/unittest/init.php

@@ -1,20 +1,13 @@
 <?php
 
 // If we're on the CLI then PHPUnit will already be loaded
-if (class_exists('PHPUnit_Util_Filter', FALSE))
+if (class_exists('PHPUnit_Util_Filter', FALSE) OR function_exists('phpunit_autoload'))
 {
-	Kohana_Tests::configure_environment();
+	Unittest_Tests::configure_environment();
 
 	// Stop kohana from processing the request
 	define('SUPPRESS_REQUEST', TRUE);
 }
-elseif (Kohana_Tests::enabled())
-{
-	// People shouldn't be running unit tests on their production server
-	// so we assume that this _could_ be a web ui request on the dev server
-	// and include phpunit so that modules realise that this could be a testing request
-	require_once 'PHPUnit/Framework.php';
-}
 
 Route::set('unittest', 'unittest(/<action>)')
 	->defaults(array(