diff --git a/Rakefile b/Rakefile
index 8d7ea037..be52b2a1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'cucumber/rake/task'
 
 begin
   require 'jeweler'
@@ -23,6 +24,7 @@ begin
     gem.add_dependency("compass")
     gem.add_development_dependency("rspec")
     gem.add_development_dependency("sdoc")
+    gem.add_development_dependency("cucumber")
   end
   
   Jeweler::GemcutterTasks.new
diff --git a/lib/middleman/template/views/layout.haml b/lib/middleman/template/views/layout.haml
index 465eea4f..1a5c2fe9 100644
--- a/lib/middleman/template/views/layout.haml
+++ b/lib/middleman/template/views/layout.haml
@@ -1,7 +1,11 @@
-%html
+!!! Strict
+%html{ :xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en" }
   %head
+    %meta{ :content => "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
     // Comment in layout
     = stylesheet_link_tag "site.css"
+    :javascript
+      // Comment in javascript
     = yield_content :head
     
   %body{ :class => page_classes }