Merge remote-tracking branch 'origin/0.1'

Conflicts:
	composer.json

_config.php

@@ -1,5 +1,8 @@
 <?php
-if(DB::get_alternative_database_name()) {
+if(
+  Config::inst()->get('Security', 'token')
+  && DB::get_alternative_database_name()
+) {
   require_once BASE_PATH . '/vendor/autoload.php';
 	
 	// Register mailer

composer.json

@@ -18,4 +18,4 @@
 		"silverstripe/behat-extension": "*"
 	},
 	"minimum-stability": "dev"
-}
+	}