Merge commit '767d99b5bffc9fd188b1fbd1b67aef20014bc1b7'

lib/jekyll.rb

@@ -12,7 +12,11 @@ require 'time'
 # 3rd party
 require 'liquid'
 require 'redcloth'
-require 'rdiscount' rescue puts "The rdiscount gem is required for markdown support!"
+begin
+  require 'rdiscount'
+rescue LoadError
+  puts "The rdiscount gem is required for markdown support!"
+end
 require 'classifier'
 require 'directory_watcher'
 
@@ -31,4 +35,4 @@ module Jekyll
   def self.process(source, dest)
     Jekyll::Site.new(source, dest).process
   end
-end
+end