Merge branch 'master' of https://github.com/kalvinarts/jekyll-haml into kalvinarts-master

Conflicts:
	lib/jekyll-haml/ext/convertible.rb

Author: samvincent

lib/jekyll-haml/ext/convertible.rb

@@ -1,18 +1,12 @@
 # Re-open Layout class to convert our HAML Layout content.
-# This solution risks Jekyll API updates, and potential
-# interference from other included plugins.
+# This solution redeclares the Layout class in a way that
+# don't risks Jekyll API updates anymore.
 
 module Jekyll
-  class Layout
-    def initialize(site, base, name)
-      @site = site
-      @base = base
-      @name = name
-
-      self.data = {}
-
-      self.process(name)
-      self.read_yaml(base, name)
+  class << Layout
+    alias old_initialize initialize
+    def initialize(*args)
+      old_initialize(*args)
       self.content = self.transform
     end
   end