Merge pull request #248 from groundh0g/issue-113

Tested without issue. No activity on #113 comments. Merging.

Rakefile

@@ -134,15 +134,10 @@ namespace :theme do
       puts "Generating '#{theme_name}' layout: #{File.basename(filename)}"
 
       open(File.join(CONFIG['layouts'], File.basename(filename)), 'w') do |page|
-        if File.basename(filename, ".html").downcase == "default"
-          page.puts "---"
-          page.puts File.read(settings_file) if File.exist?(settings_file)
-          page.puts "---"
-        else
-          page.puts "---"
-          page.puts "layout: default"
-          page.puts "---"
-        end 
+        page.puts "---"
+        page.puts File.read(settings_file) if File.exist?(settings_file)
+        page.puts "layout: default" unless File.basename(filename, ".html").downcase == "default"
+        page.puts "---"
         page.puts "{% include JB/setup %}"
         page.puts "{% include themes/#{theme_name}/#{File.basename(filename)} %}" 
       end

_layouts/page.html

@@ -1,4 +1,6 @@
 ---
+theme :
+  name : bootstrap-3
 layout: default
 ---
 {% include JB/setup %}

_layouts/post.html

@@ -1,4 +1,6 @@
 ---
+theme :
+  name : bootstrap-3
 layout: default
 ---
 {% include JB/setup %}