Merge pull request #55 from yihangho/master

Bump up the versions of Jekyll and other dependencies

Gemfile.lock

@@ -1,67 +1,85 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
+      tzinfo (~> 1.1)
     blankslate (2.1.2.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
     coderay (1.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
     colorator (0.1)
-    commander (4.1.6)
-      highline (~> 1.6.11)
+    execjs (2.0.2)
     fast-stemmer (1.0.2)
+    ffi (1.9.3)
     ffi (1.9.3-x86-mingw32)
-    highline (1.6.20)
     i18n (0.6.9)
-    jekyll (1.4.2)
+    jekyll (2.0.2)
       classifier (~> 1.3)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      kramdown (~> 1.3)
       liquid (~> 2.5.5)
-      listen (~> 1.3)
-      maruku (~> 0.7.0)
+      listen (~> 2.5)
+      mercenary (~> 0.3.1)
       pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
-      safe_yaml (~> 0.9.7)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    kramdown (1.3.1)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-sass-converter (1.0.0)
+      sass (~> 3.2)
+    json (1.8.1)
+    kramdown (1.3.3)
     liquid (2.5.5)
-    listen (1.3.1)
+    listen (2.7.4)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    maruku (0.7.1)
-    minitest (4.7.5)
-    multi_json (1.8.4)
+    mercenary (0.3.3)
+    minitest (5.3.3)
+    nio4r (1.0.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.8)
+    pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rake (10.1.1)
+    rake (10.3.1)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.4)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
-    safe_yaml (0.9.7)
-    stringex (2.2.0)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    toml (0.1.0)
+    redcarpet (3.1.1)
+    safe_yaml (1.0.3)
+    sass (3.3.7)
+    stringex (2.5.2)
+    thor (0.19.1)
+    thread_safe (0.3.3)
+    timers (1.1.0)
+    toml (0.1.1)
       parslet (~> 1.5.0)
-    tzinfo (0.3.38)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+    yajl-ruby (1.1.0)
     yajl-ruby (1.1.0-x86-mingw32)
 
 PLATFORMS
+  ruby
   x86-mingw32
 
 DEPENDENCIES

_config.yml

@@ -2,7 +2,7 @@ title:            Site Title
 description:      Describe your website.
 # Your site's domain goes here. Leave localhost server or blank when working locally.
 url:              http://localhost:4000
-disqus_shortname: 
+disqus_shortname:
 
 # Owner/author information
 owner:
@@ -11,26 +11,26 @@ owner:
   bio:            "Describe your self."
   email:          [email protected]
   # Social networking links are used in author-bio sidebar. Update and remove as you like.
-  twitter:        
-  facebook:       
-  github:         
-  stackoverflow: 
-  linkedin:       
-  instagram:      
-  lastfm:         
-  tumblr: 
-  pinterest: 
-  foursquare: 
-  steam: 
-  dribbble: 
+  twitter:
+  facebook:
+  github:
+  stackoverflow:
+  linkedin:
+  instagram:
+  lastfm:
+  tumblr:
+  pinterest:
+  foursquare:
+  steam:
+  dribbble:
   # For Google Authorship https://plus.google.com/authorship
   google_plus:
 
 # Analytics and webmaster tools stuff goes here
-google_analytics:   
-google_verify:      
+google_analytics:
+google_verify:
 # https://ssl.bing.com/webmaster/configure/verify/ownership Option 2 content= goes here
-bing_verify:        
+bing_verify:
 
 # Links to include in top navigation
 # For external links add external: true
@@ -48,7 +48,7 @@ links:
 # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 timezone:    America/New_York
 future:      true
-pygments:    true
+highlighter: pygments
 markdown:    kramdown
 
 # https://github.com/mojombo/jekyll/wiki/Permalinks
@@ -62,11 +62,11 @@ kramdown:
   use_coderay: false
 
   coderay:
-    coderay_line_numbers: 
+    coderay_line_numbers:
     coderay_line_numbers_start: 1
     coderay_tab_width: 4
     coderay_bold_every: 10
     coderay_css: class
 
 include: [".htaccess"]
-exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules"]
+exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules"]