Merge branch 'custom-layout-directory' of https://github.com/tombell/jekyll into tombell-custom-layout-directory

Conflicts:
	lib/jekyll/site.rb

lib/jekyll.rb

@@ -59,6 +59,7 @@ module Jekyll
     'source'       => Dir.pwd,
     'destination'  => File.join(Dir.pwd, '_site'),
     'plugins'      => File.join(Dir.pwd, '_plugins'),
+    'layouts'      => '_layouts',
 
     'future'       => true,
     'lsi'          => false,

lib/jekyll/site.rb

@@ -101,12 +101,12 @@ module Jekyll
       self.read_directories
     end
 
-    # Read all the files in <source>/_layouts and create a new Layout object
+    # Read all the files in <source>/<layouts> and create a new Layout object
     # with each one.
     #
     # Returns nothing.
     def read_layouts
-      base = File.join(self.source, "_layouts")
+      base = File.join(self.source, self.config['layouts'])
       return unless File.exists?(base)
       entries = []
       Dir.chdir(base) { entries = filter_entries(Dir['*.*']) }