lib/caboodle/config.rb in caboodle-0.1.3 vs lib/caboodle/config.rb in caboodle-0.1.4

@@ -1,12 +1,14 @@
 module Caboodle  
-  Kits = []
-  MenuItems = []
-  Javascripts = []
-  Stylesheets = []
-  Defaults = Hashie::Mash.new()
+  Kits             = []
+  MenuItems        = []
+  Javascripts      = []
+  Stylesheets      = []
+  Defaults         = Hashie::Mash.new(Hashie::Mash.new(YAML.load_file(File.join(File.dirname(__FILE__), 'config','defaults.yml'))))
   RequiredSettings = Hashie::Mash.new()
-  Site = Defaults.clone
+  Layout           = Hashie::Mash.new()
+  Site             = Defaults.clone
+  
   Site.required_settings = []
   Site.kits = [] unless Site.kits
-  Defaults.merge!(Hashie::Mash.new(YAML.load_file(File.join( File.join(File.dirname(__FILE__), 'config','defaults.yml')))))
+  puts Site.inspect
 end
\ No newline at end of file