Fix to config instance vs library on calipso.config

app.js

@@ -47,7 +47,7 @@ function bootApplication(next) {
   app.isCluster = false;
 
   // Load configuration
-  var Config = calipso.config; //require(path + "/lib/core/Config").Config;
+  var Config = calipso.configuration; //require(path + "/lib/core/Config").Config;
   app.config = new Config();
   app.config.init(function(err) {
 

lib/calipso.js

@@ -76,6 +76,7 @@ function init(app, initCallback) {
   // Load the calipso package.json into app.about
   calipso.module.loadAbout(app, rootpath, 'package.json');
 
+  // config is the actual instance of loaded config, configuration is the library.
   calipso.config = app.config;
 
   // Store the callback function for later

test/helpers/calipsoHelper.js

@@ -6,7 +6,7 @@ var calipso = require('./require')('calipso'),
 	fs = require('fs'),
 	colors = require('colors'),
 	rootpath = process.cwd() + '/',
-	Config = require('./require')('core/Config'),
+	Config = require('./require')('core/Configuration'),
 	http = require('http'),
 	mochaConfig = path.join(rootpath,'tmp','mocha.json');
 
@@ -23,7 +23,6 @@ function MockApp(next) {
 	// Configuration - always start with default
 	var defaultConfig = path.join(rootpath, 'test', 'helpers', 'defaultConfig.json');
 
-
 	var statusMsg = '\r\nBase path: '.grey + rootpath.cyan + '\r\nUsing config: '.grey + defaultConfig.cyan + '\r\nIn environment: '.grey + (process.env.NODE_ENV || 'development').cyan;
 	if(!process.env.CALIPSO_COV) console.log(statusMsg);
 

test/lib.core.storage.js

@@ -13,8 +13,6 @@ var should = require('should'),
 describe('Storage', function(){
 
   before(function(done) {
-      // Initialise calipso, set installed to false
-      calipsoHelper.calipso.loaded.should.equal(true);
       done();
   });