Merge pull request #1015 from mojombo/loose-pygments-dep

Loosen Pygments Dependency

lib/jekyll.rb

@@ -24,7 +24,6 @@ require 'English'
 # 3rd party
 require 'liquid'
 require 'maruku'
-require 'pygments'
 require 'colorator'
 
 # internal requires

lib/jekyll/converters/markdown/redcarpet_parser.rb

@@ -4,6 +4,7 @@ module Jekyll
       class RedcarpetParser
         def initialize(config)
           require 'redcarpet'
+          require 'pygments'
           @config = config
           @redcarpet_extensions = {}
           @config['redcarpet']['extensions'].each { |e| @redcarpet_extensions[e.to_sym] = true }

lib/jekyll/logger.rb

@@ -1,5 +1,7 @@
+require 'logger'
+
 module Jekyll
-  module Logger
+  class Logger < Logger
     # Public: Print a jekyll message to stdout
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.

lib/jekyll/tags/highlight.rb

@@ -49,6 +49,8 @@ eos
       end
 
       def render_pygments(context, code)
+        require 'pygments'
+
         @options[:encoding] = 'utf-8'
 
         output = add_code_tags(