Rely directly on rdiscount, clean up Tilt load errors

lib/middleman.rb

@@ -68,6 +68,8 @@ module Middleman
     autoload :Haml, "middleman/renderers/haml"
     autoload :Sass, "middleman/renderers/sass"
     autoload :Slim, "middleman/renderers/slim"
+    autoload :Markdown, "middleman/renderers/markdown"
+    autoload :CoffeeScript, "middleman/renderers/coffee_script"
   end
 
   # Features API

lib/middleman/features/front_matter.rb

@@ -45,22 +45,6 @@ module Middleman::Features::FrontMatter
   end
 
   # MARKDOWN  
-  class MarukuTemplate < ::Tilt::MarukuTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class KramdownTemplate < ::Tilt::KramdownTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class BlueClothTemplate < ::Tilt::BlueClothTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
   class RDiscountTemplate < ::Tilt::RDiscountTemplate
     include Middleman::Features::FrontMatter::YamlAware
   end

lib/middleman/renderers/coffee_script.rb

@@ -0,0 +1,12 @@
+module Middleman
+  module Renderers
+    module CoffeeScript
+      class << self
+        def registered(app)
+          require "coffee_script"
+        end
+        alias :included :registered
+      end
+    end
+  end
+end

lib/middleman/renderers/markdown.rb

@@ -0,0 +1,12 @@
+module Middleman
+  module Renderers
+    module Markdown
+      class << self
+        def registered(app)
+          require "rdiscount"
+        end
+        alias :included :registered
+      end
+    end
+  end
+end

lib/middleman/server.rb

@@ -78,6 +78,8 @@ module Middleman
     register Middleman::Renderers::Slim
     register Middleman::Renderers::Haml
     register Middleman::Renderers::Sass
+    register Middleman::Renderers::Markdown
+    register Middleman::Renderers::CoffeeScript
     
     # Rack helper for adding mime-types during local preview
     def self.mime(ext, type)