1 files changed, 10 insertions, 6 deletions
diff --git a/lib/parse/parseConfig.js b/lib/parse/parseConfig.js
index 5200de2..39d57f0 100644
--- a/lib/parse/parseConfig.js
+++ b/lib/parse/parseConfig.js
@@ -1,7 +1,5 @@
 var Promise = require('../utils/promise');
-var Config = require('../models/config');
 
-var File = require('../models/file');
 var validateConfig = require('./validateConfig');
 var CONFIG_FILES = require('../constants/configFiles');
 
@@ -13,6 +11,7 @@ var CONFIG_FILES = require('../constants/configFiles');
 */
 function parseConfig(book) {
     var fs = book.getFS();
+    var config = book.getConfig();
 
     return Promise.some(CONFIG_FILES, function(filename) {
         // Is this file ignored?
@@ -38,13 +37,18 @@ function parseConfig(book) {
     })
 
     .then(function(result) {
-        var file = result? result.file : File();
         var values = result? result.values : {};
-
         values = validateConfig(values);
 
-        var config = Config.create(file, values);
-        return book.set('config', config);
+        // Set the file
+        if (result.file) {
+            config = config.setFile(result.file);
+        }
+
+        // Merge with old values
+        config = config.mergeValues(values);
+
+        return book.setConfig(config);
     });
 }