Release 2.0.0

Merge pull request #2312 from jekyll/release-2.0.0
Rename 2.0.0 release post to match title. [ci skip]
2026-04-28 03:01:03 -04:00 · 2014-05-06 21:22:48 -04:00 · 2014-05-06 21:20:53 -04:00 · 2014-05-06 21:13:43 -04:00 · 2014-05-06 21:12:59 -04:00 · 2014-05-06 21:09:51 -04:00
211 changed files with 7667 additions and 2989 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,27 @@
 language: ruby
 cache: bundler
-before_install:
-  - gem install bundler
+install:
+- script/rebund download
+- travis_retry bundle install --path vendor/bundle
 rvm:
-  - 2.0.0
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
-script: bundle exec rake
+- 2.1.1
+- 2.0.0
+- 1.9.3
+script: script/cibuild
+after_script:
+- script/rebund upload
 notifications:
  irc:
    on_success: change
    on_failure: change
    channels:
-      - "irc.freenode.org#jekyll"
-    #on_success: change
-    #on_failure: change
+    - irc.freenode.org#jekyll
    template:
-      - "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}"
+    - '%{repository}#%{build_number} (%{branch}) %{message} %{build_url}'
  email:
    on_success: never
    on_failure: never
+env:
+  global:
+  - secure: bt5nglPTdsc0N5fB1dOJz2WbM81dGpDuVD8PnhEsxgUfoo6xavhU4+pNrUADlSUqQ1aJrdU+MKW4x+JZ2ZnJS8vOpNzRymuMZSbFaljK4pgFGiKFgBdMKxVikvoYcxKCjLAl7NJZ11W6hUw+JtJScClDZwrJJAQB6I7Isp/LsdM=
+  - secure: Ym8nx7nbfGYGo47my92M+deJykaiMkdZdb615EO51liv/xy/0aQ919Jpfieugc9d3zVnm+zFGPbpv4YzRpsik6OlVBNa4lP+BnQ27ptf5YcLWD8Hksi7845WFLecXMoaTCoYer/TvYZsIWJb2nSDMH9qbfZhnd1YZKuvUpK0rEU=
--- a/CONTRIBUTING.markdown
+++ b/CONTRIBUTING.markdown
@@ -8,7 +8,7 @@ following in mind:
 * If you're creating a small fix or patch to an existing feature, just a simple
  test will do. Please stay in the confines of the current test suite and use
  [Shoulda](http://github.com/thoughtbot/shoulda/tree/master) and
-  [RR](http://github.com/btakita/rr/tree/master).
+  [RR](https://github.com/rr/rr).
 * If it's a brand new feature, make sure to create a new
  [Cucumber](https://github.com/cucumber/cucumber/) feature and reuse steps
  where appropriate. Also, whipping up some documentation in your fork's `site`
@@ -53,7 +53,7 @@ Here's the most direct way to get your work merged into the project:
 * Make sure everything still passes by running `rake`.
 * If necessary, rebase your commits into logical chunks, without errors.
 * Push the branch up ( `git push origin my_awesome_feature` ).
-* Create a pull request against mojombo/jekyll and describe what your change
+* Create a pull request against jekyll/jekyll and describe what your change
  does and the why you think it should be merged.

 Updating Documentation
@@ -63,14 +63,14 @@ We want the Jekyll documentation to be the best it can be. We've
 open-sourced our docs and we welcome any pull requests if you find it
 lacking.

-You can find the documentation for jekyllrb.com in the 
-[site](https://github.com/mojombo/jekyll/tree/master/site) directory of
+You can find the documentation for jekyllrb.com in the
+[site](https://github.com/jekyll/jekyll/tree/master/site) directory of
 Jekyll's repo on GitHub.com.

 All documentation pull requests should be directed at `master`.  Pull
-requests directed at another branch will not be accepted. 
+requests directed at another branch will not be accepted.

-The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub 
+The [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) on GitHub
 can be freely updated without a pull request as all GitHub users have access.

 Gotchas
@@ -78,7 +78,7 @@ Gotchas

 * If you want to bump the gem version, please put that in a separate commit.
  This way, the maintainers can control when the gem gets released.
-* Try to keep your patch(es) based from the latest commit on mojombo/jekyll.
+* Try to keep your patch(es) based from the latest commit on jekyll/jekyll.
  The easier it is to apply your work, the less work the maintainers have to do,
  which is always a good thing.
 * Please don't tag your GitHub issue with [fix], [feature], etc. The maintainers
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,270 @@

 ### Site Enhancements

+## 2.0.0 / 2014-05-06
+
+### Major Enhancements
+  * Add "Collections" feature (#2199)
+  * Add gem-based plugin whitelist to safe mode (#1657)
+  * Replace the commander command line parser with a more robust
+    solution for our needs called `mercenary` (#1706)
+  * Remove support for Ruby 1.8.x (#1780)
+  * Move to jekyll/jekyll from mojombo/jekyll (#1817)
+  * Allow custom markdown processors (#1872)
+  * Provide support for the Rouge syntax highlighter (#1859)
+  * Provide support for Sass (#1932)
+  * Provide a 300% improvement when generating sites that use
+    `Post#next` or `Post#previous` (#1983)
+  * Provide support for CoffeeScript (#1991)
+  * Replace Maruku with Kramdown as Default Markdown Processor (#1988)
+  * Expose `site.static_files` to Liquid (#2075)
+  * Complete redesign of the template site generated by `jekyll new` (#2050)
+  * Update Listen from 1.x to 2.x (#2097)
+  * Front-matter defaults (#2205)
+  * Deprecate `relative_permalinks` configuration option (default to `false`) (#2307)
+  * Exclude files based on prefix as well as `fnmatch?` (#2303)
+
+### Minor Enhancements
+  * Move the EntryFilter class into the Jekyll module to avoid polluting the
+    global namespace (#1800)
+  * Add `group_by` Liquid filter create lists of items grouped by a common
+    property's value (#1788)
+  * Add support for Maruku's `fenced_code_blocks` option (#1799)
+  * Update Redcarpet dependency to ~> 3.0 (#1815)
+  * Automatically sort all pages by name (#1848)
+  * Better error message when time is not parseable (#1847)
+  * Allow `include` tag variable arguments to use filters (#1841)
+  * `post_url` tag should raise `ArgumentError` for invalid name (#1825)
+  * Bump dependency `mercenary` to `~> 0.2.0` (#1879)
+  * Bump dependency `safe_yaml` to `~> 1.0` (#1886)
+  * Allow sorting of content by custom properties (#1849)
+  * Add `--quiet` flag to silence output during build and serve (#1898)
+  * Add a `where` filter to filter arrays based on a key/value pair
+    (#1875)
+  * Route 404 errors to a custom 404 page in development (#1899)
+  * Excludes are now relative to the site source (#1916)
+  * Bring MIME Types file for `jekyll serve` to complete parity with GH Pages
+    servers (#1993)
+  * Adding Breakpoint to make new site template more responsive (#2038)
+  * Default to using the UTF-8 encoding when reading files. (#2031)
+  * Update Redcarpet dependency to ~> 3.1 (#2044)
+  * Remove support for Ruby 1.9.2 (#2045)
+  * Add `.mkdown` as valid Markdown extension (#2048)
+  * Add `index.xml` to the list of WEBrick directory index files (#2041)
+  * Make the `layouts` config key relative to CWD or to source (#2058)
+  * Update Kramdown to `~> 1.3` (#1894)
+  * Remove unnecessary references to `self` (#2090)
+  * Update to Mercenary v0.3.x (#2085)
+  * Ship Sass support as a separate gem (#2098)
+  * Extract core extensions into a Utils module (#2112)
+  * Refactor CLI & Commands For Greater Happiness (#2143)
+  * Provide useful error when Pygments returns `nil` and error out (#2148)
+  * Add support for unpublished drafts (#2164)
+  * Add `force_polling` option to the `serve` command (#2165)
+  * Clean up the `<head>` in the site template (#2186)
+  * Permit YAML blocks to end with three dots to better conform with the
+    YAML spec (#2110)
+  * Use `File.exist?` instead of deprecated `File.exists?` (#2214)
+  * Require newline after start of YAML front-matter header (#2211)
+  * Add the ability for pages to be marked as `published: false` (#1492)
+  * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy
+    looking up of variable values in a Liquid context. (#2253)
+  * Remove literal lang name from class (#2292)
+  * Return `utf-8` encoding in header for  webrick error page response (#2289)
+  * Make template site easier to customize (#2268)
+  * Add two-digit year to permalink template option (#2301)
+  * Add `site.documents` to Liquid payload (list of all docs) (#2295)
+  * Take into account missing values in the Liquid sort filter (#2299)
+
+### Bug Fixes
+  * Don't allow nil entries when loading posts (#1796)
+  * Remove the scrollbar that's always displayed in new sites generated
+    from the site template (#1805)
+  * Add `#path` to required methods in `Jekyll::Convertible` (#1866)
+  * Default Maruku fenced code blocks to ON for 2.0.0-dev (#1831)
+  * Change short opts for host and port for `jekyll docs` to be consistent with
+    other subcommands (#1877)
+  * Fix typos (#1910)
+  * Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958)
+  * Fixes full path leak to source directory when using include tag (#1951)
+  * Don't generate pages that aren't being published (#1931)
+  * Use `SafeYAML.load` to avoid conflicts with other projects (#1982)
+  * Relative posts should never fail to build (#1976)
+  * Remove executable bits of non executable files (#2056)
+  * `#path` for a draft is now `_drafts` instead of `_posts` (#2042)
+  * Patch a couple show-stopping security vulnerabilities (#1946)
+  * Sanitize paths uniformly, in a Windows-friendly way (#2065, #2109)
+  * Update gem build steps to work correctly on Windows (#2118)
+  * Remove obsolete `normalize_options` method call from `bin/jekyll` (#2121).
+  * Remove `+` characters from Pygments lexer names when adding as a CSS
+    class (#994)
+  * Remove some code that caused Ruby interpreter warnings (#2178)
+  * Only strip the drive name if it begins the string (#2175)
+  * Remove default post with invalid date from site template (#2200)
+  * Fix `Post#url` and `Page#url` escape (#1568)
+  * Strip newlines from the `{% highlight %}` block content (#1823)
+  * Load in `rouge` only when it's been requested as the highlighter (#2189)
+  * Convert input to string before XML escaping (`xml_escape` liquid filter) (#2244)
+  * Modify configuration key for Collections and reset properly. (#2238)
+  * Avoid duplicated output using `highlight` tag (#2264)
+  * Only use Jekyll.logger for output (#2307)
+  * Close the file descriptor in `has_yaml_header?` (#2310)
+  * Add `output` to `Document` liquid output hash (#2309)
+
+### Development Fixes
+  * Add a link to the site in the README.md file (#1795)
+  * Add in History and site changes from `v1-stable` branch (#1836)
+  * Testing additions on the Excerpt class (#1893)
+  * Fix the `highlight` tag feature (#1859)
+  * Test Jekyll under Ruby 2.1.0 (#1900)
+  * Add script/cibuild for fun and profit (#1912)
+  * Use `Forwardable` for delegation between `Excerpt` and `Post`
+    (#1927)
+  * Rename `read_things` to `read_content` (#1928)
+  * Add `script/branding` script for ASCII art lovin' (#1936)
+  * Update the README to reflect the repo move (#1943)
+  * Add the project vision to the README (#1935)
+  * Speed up Travis CI builds by using Rebund (#1985)
+  * Use Yarp as a Gem proxy for Travis CI (#1984)
+  * Remove Yarp as a Gem proxy for Travis CI (#2004)
+  * Move the reading of layouts into its own class (#2020)
+  * Test Sass import (#2009)
+  * Switch Maruku and Kramdown in lists of Runtime vs. Development dependencies (#2049)
+  * Clean up the gemspec for the project (#2095)
+  * Add Japanese translation of README and CONTRIBUTING docs. (#2081)
+  * Re-align the tables in Cucumber (#2108)
+  * Trim trailing spaces and convert tabs to spaces (#2122)
+  * Fix the failing Travis scenarios due to Cucumber issues (#2155)
+  * Wrap `bundle install` in `travis_retry` to retry when RubyGems fails (#2160)
+  * Refactor tags and categories (#1639)
+  * Extract plugin management into its own class (#2197)
+  * Add missing tests for `Command` (#2216)
+  * Update `rr` link in CONTRIBUTING doc (#2247)
+  * Streamline cucumber execution of `jekyll` subcommands (#2258)
+  * Refactor `Commands::Serve`. (#2269)
+  * Refactor `highlight` tag (#2154)
+  * Update `Util` hash functions with latest from Rails (#2273)
+  * Workaround for Travis bug (#2290) 
+
+### Site Enhancements
+  * Document Kramdown's GFM parser option (#1791)
+  * Move CSS to includes & update normalize.css to v2.1.3 (#1787)
+  * Minify CSS only in production (#1803)
+  * Fix broken link to installation of Ruby on Mountain Lion blog post on
+    Troubleshooting docs page (#1797)
+  * Fix issues with 1.4.1 release blog post (#1804)
+  * Add note about deploying to OpenShift (#1812)
+  * Collect all Windows-related docs onto one page (#1818)
+  * Fixed typo in datafiles doc page (#1854)
+  * Clarify how to access `site` in docs (#1864)
+  * Add closing `<code>` tag to `context.registers[:site]` note (#1867)
+  * Fix link to @mojombo's site source (#1897)
+  * Add `paginate: nil` to default configuration in docs (#1896)
+  * Add link to our License in the site footer (#1889)
+  * Add a charset note in "Writing Posts" doc page (#1902)
+  * Disallow selection of path and prompt in bash examples
+  * Add jekyll-compass to the plugin list (#1923)
+  * Add note in Posts docs about stripping `<p>` tags from excerpt (#1933)
+  * Add additional info about the new exclude behavior (#1938)
+  * Linkify 'awesome contributors' to point to the contributors graph on
+    GitHub (#1940)
+  * Update `docs/sites.md` link to GitHub Training materials (#1949)
+  * Update `master` with the release info from 1.4.3 (#1947)
+  * Define docs nav in datafile (#1953)
+  * Clarify the docs around the naming convention for posts (#1971)
+  * Add missing `next` and `previous` docs for post layouts and templates (#1970)
+  * Add note to `Writing posts` page about how to strip html from excerpt (#1962)
+  * Add `jekyll-humanize` plugin to plugin list (#1998)
+  * Add `jekyll-font-awesome` plugin to plugin list (#1999)
+  * Add `sublime-jekyll` to list of Editor plugins (#2001)
+  * Add `vim-jekyll` to the list of Editor plugins (#2005)
+  * Fix non-semantic nesting of `p` tags in `news_item` layout (#2013)
+  * Document destination folder cleaning (#2016)
+  * Updated instructions for NearlyFreeSpeech.NET installation (#2015)
+  * Update link to rack-jekyll on "Deployment Methods" page (#2047)
+  * Fix typo in /docs/configuration (#2073)
+  * Fix count in docs for `site.static_files` (#2077)
+  * Update configuration docs to indicate utf-8 is the default for 2.0.0
+    and ASCII for 1.9.3 (#2074)
+  * Add info about unreleased feature to the site (#2061)
+  * Add whitespace to liquid example in GitHub Pages docs (#2084)
+  * Clarify the way Sass and CoffeeScript files are read in and output (#2067)
+  * Add lyche gallery tag plugin link to list of plugins (#2094)
+  * Add Jekyll Pages Directory plugin to list of plugins (#2096)
+  * Update Configuration docs page with new markdown extension (#2102)
+  * Add `jekyll-image-set` to the list of third-party plugins (#2105)
+  * Losslessly compress images (#2128)
+  * Update normalize.css to 3.0.0 (#2126)
+  * Update modernizr to v2.7.1 (#2129)
+  * Add `jekyll-ordinal` to list of third-party plugins (#2150)
+  * Add `jekyll_figure` to list of third-party plugins (#2158)
+  * Clarify the documentation for safe mode (#2163)
+  * Some HTML tidying (#2130)
+  * Remove modernizr and use html5shiv.js directly for IE less than v9 (#2131)
+  * Remove unused images (#2187)
+  * Use `array_to_sentence_string` filter when outputting news item
+    categories (#2191)
+  * Add link to Help repo in primary navigation bar (#2177)
+  * Switch to using an ico file for the shortcut icon (#2193)
+  * Use numbers to specify font weights and only bring in font weights used (#2185)
+  * Add a link to the list of all tz database time zones (#1824)
+  * Clean-up and improve documentation `feed.xml` (#2192)
+  * Remove duplicate entry in list of third-party plugins (#2206)
+  * Reduce the whitespace in the favicon. (#2213)
+  * Add `jekyll-page-collections` to list of third-party plugins (#2215)
+  * Add a cross-reference about `post_url` (#2243)
+  * Add `jekyll-live-tiles` to list of third-party plugins (#2250)
+  * Fixed broken link to GitHub training material site source (#2257)
+  * Update link to help repo, now called `jekyll-help` (#2277)
+  * Fix capitalization of 'Jekyll' on Deployment Methods page (#2291)
+  * Include plugins by sonnym in list of third-party plugins (#2297)
+  * Add deprecated articles keeper filter to list of third-party plugins (#2300)
+  * Simplify and improve our CSS. (#2127)
+  * Use black text color for the mobile navbar (#2306)
+  * Use the built in date filter and `site.time` for the copyright year. (#2305)
+  * Update html5shiv to v3.7.2 (#2304)
+  * Add 2.0.0 release post (#2298)
+  * Add docs for custom markdown processors (#2298)
+  * Add docs for `where` and `group_by` Liquid filters (#2298)
+  * Remove notes in docs for unreleased features (#2309)
+
+## 1.5.1 / 2014-03-27
+
+### Bug Fixes
+
+  * Only strip the drive name if it begins the string (#2176)
+
+## 1.5.0 / 2014-03-24
+
+### Minor Enhancements
+
+  * Loosen `safe_yaml` dependency to `~> 1.0` (#2167)
+  * Bump `safe_yaml` dependency to `~> 1.0.0` (#1942)
+
+### Bug Fixes
+
+  * Fix issue where filesystem traversal restriction broke Windows (#2167)
+  * Lock `maruku` at `0.7.0` (#2167)
+
+### Development Fixes
+
+  * Lock `cucumber` at `1.3.11` (#2167)
+
+## 1.4.3 / 2014-01-13
+
+### Bug Fixes
+  * Patch show-stopping security vulnerabilities (#1944)
+
+## 1.4.2 / 2013-12-16
+
+### Bug Fixes
+  * Turn on Maruku fenced code blocks by default (#1830)
+
+## 1.4.1 / 2013-12-09
+
+### Bug Fixes
+  * Don't allow nil entries when loading posts (#1796)
+
 ## 1.4.0 / 2013-12-07

 ### Major Enhancements
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
 (The MIT License)

-Copyright (c) 2008 Tom Preston-Werner
+Copyright (c) 2008-2014 Tom Preston-Werner

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
--- a/README.markdown
+++ b/README.markdown
@@ -1,21 +1,25 @@
-# Jekyll
+# [Jekyll](http://jekyllrb.com/)

-[![Gem Version](https://badge.fury.io/rb/jekyll.png)](http://badge.fury.io/rb/jekyll)
+[![Gem Version](https://badge.fury.io/rb/jekyll.svg)](http://badge.fury.io/rb/jekyll)

-[![Build Status](https://secure.travis-ci.org/mojombo/jekyll.png?branch=master)](https://travis-ci.org/mojombo/jekyll)
-[![Code Climate](https://codeclimate.com/github/mojombo/jekyll.png)](https://codeclimate.com/github/mojombo/jekyll)
-[![Dependency Status](https://gemnasium.com/mojombo/jekyll.png)](https://gemnasium.com/mojombo/jekyll)
-[![Coverage Status](https://coveralls.io/repos/mojombo/jekyll/badge.png)](https://coveralls.io/r/mojombo/jekyll)
+[![Build Status](https://secure.travis-ci.org/jekyll/jekyll.svg?branch=master)](https://travis-ci.org/jekyll/jekyll)
+[![Code Climate](https://codeclimate.com/github/jekyll/jekyll.png)](https://codeclimate.com/github/jekyll/jekyll)
+[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll)
+[![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll)

-By Tom Preston-Werner, Nick Quaranto, and many awesome contributors!
+By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!

-Jekyll is a simple, blog aware, static site generator. It takes a template directory (representing the raw form of a website), runs it through Textile or Markdown and Liquid converters, and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind [GitHub Pages](http://pages.github.com), which you can use to host your project's page or blog right here from GitHub.
+Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories.
+
+## Philosophy
+
+Jekyll does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content.

 ## Getting Started

 * [Install](http://jekyllrb.com/docs/installation/) the gem
 * Read up about its [Usage](http://jekyllrb.com/docs/usage/) and [Configuration](http://jekyllrb.com/docs/configuration/)
-* Take a gander at some existing [Sites](http://wiki.github.com/mojombo/jekyll/sites)
+* Take a gander at some existing [Sites](http://wiki.github.com/jekyll/jekyll/sites)
 * Fork and [Contribute](http://jekyllrb.com/docs/contributing/) your own modifications
 * Have questions? Check out `#jekyll` on irc.freenode.net.

@@ -34,16 +38,16 @@ Jekyll is a simple, blog aware, static site generator. It takes a template direc
 * Colorator: Colorizes command line output (Ruby)
 * Classifier: Generating related posts (Ruby)
 * Directory Watcher: Auto-regeneration of sites (Ruby)
+* Kramdown: Default Markdown engine (Ruby)
 * Liquid: Templating system (Ruby)
-* Maruku: Default markdown engine (Ruby)
 * Pygments.rb: Syntax highlighting (Ruby/Python)
 * RedCarpet: Markdown engine (Ruby)
 * Safe YAML: YAML Parser built for security (Ruby)

 ## Developer Dependencies

-* Kramdown: Markdown-superset converter (Ruby)
 * Launchy: Cross-platform file launcher (Ruby)
+* Maruku: Markdown-superset interpreter (Ruby)
 * RDiscount: Discount Markdown Processor (Ruby)
 * RedCloth: Textile support (Ruby)
 * RedGreen: Nicer test output (Ruby)
@@ -53,4 +57,4 @@ Jekyll is a simple, blog aware, static site generator. It takes a template direc

 ## License

-See [LICENSE](https://github.com/mojombo/jekyll/blob/master/LICENSE).
+See [LICENSE](https://github.com/jekyll/jekyll/blob/master/LICENSE).
--- a/58
+++ b/58
@@ -5,6 +5,7 @@ require 'date'
 require 'yaml'

 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
+require 'jekyll/version'

 #############################################################################
 #
@@ -17,20 +18,7 @@ def name
 end

 def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def date
-  Date.today.to_s
-end
-
-def file_date
-  Date.today.strftime("%F")
-end
-
-def rubyforge_project
-  name
+  Jekyll::VERSION
 end

 def gemspec_file
@@ -84,7 +72,7 @@ end
 #
 #############################################################################

-if RUBY_VERSION > '1.9' && ENV["TRAVIS"] == "true"
+if ENV["TRAVIS"] == "true"
  require 'coveralls/rake/task'
  Coveralls::RakeTask.new

@@ -156,7 +144,7 @@ namespace :site do

  desc "Update normalize.css library to the latest version and minify"
  task :update_normalize_css do
-    Dir.chdir("site/css") do
+    Dir.chdir("site/_includes/css") do
      sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
      sh 'sass "normalize.scss":"normalize.css" --style compressed'
      sh 'rm "normalize.scss"'
@@ -169,7 +157,7 @@ namespace :site do
    puts "Checking for gh-pages dir..."
    unless File.exist?("./gh-pages")
      puts "No gh-pages directory found. Run the following commands first:"
-      puts "  `git clone git@github.com:mojombo/jekyll gh-pages"
+      puts "  `git clone git@github.com:jekyll/jekyll gh-pages"
      puts "  `cd gh-pages"
      puts "  `git checkout gh-pages`"
      exit(1)
@@ -192,7 +180,7 @@ namespace :site do
    sha = `git log`.match(/[a-z0-9]{40}/)[0]
    Dir.chdir('gh-pages') do
      sh "git add ."
-      sh "git commit -m 'Updating to #{sha}.'"
+      sh "git commit --allow-empty -m 'Updating to #{sha}.'"
      sh "git push origin gh-pages"
    end
    puts 'Done.'
@@ -233,7 +221,7 @@ namespace :site do
        post.puts("title: 'Jekyll #{release} Released'")
        post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
        post.puts("author: ")
-        post.puts("version: #{version}")
+        post.puts("version: #{release}")
        post.puts("categories: [release]")
        post.puts("---")
        post.puts
@@ -263,36 +251,8 @@ task :release => :build do
  sh "gem push pkg/#{name}-#{version}.gem"
 end

-task :build => :gemspec do
-  sh "mkdir -p pkg"
+task :build do
+  mkdir_p "pkg"
  sh "gem build #{gemspec_file}"
  sh "mv #{gem_file} pkg"
 end
-
-task :gemspec do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec_file)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-  replace_header(head, :date)
-  #comment this out if your rubyforge_project has a different name
-  replace_header(head, :rubyforge_project)
-
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg|coverage)/ }.
-    map { |file| "    #{file}" }.
-    join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec_file, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec_file}"
-end
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -3,156 +3,38 @@ STDOUT.sync = true

 $:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })

-require 'commander/import'
 require 'jekyll'
+require 'mercenary'
+
+%w[jekyll-import].each do |blessed_gem|
+  begin
+    require blessed_gem
+  rescue LoadError
+  end
+end

 Jekyll::Deprecator.process(ARGV)

-program :name, 'jekyll'
-program :version, Jekyll::VERSION
-program :description, 'Jekyll is a blog-aware, static site generator in Ruby'
+Mercenary.program(:jekyll) do |p|
+  p.version Jekyll::VERSION
+  p.description 'Jekyll is a blog-aware, static site generator in Ruby'
+  p.syntax 'jekyll <subcommand> [options]'

-default_command :default
+  p.option 'source', '-s', '--source [DIR]', 'Source directory (defaults to ./)'
+  p.option 'destination', '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
+  p.option 'safe', '--safe', 'Safe mode (defaults to false)'
+  p.option 'plugins', '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
+  p.option 'layouts', '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'

-global_option '-s', '--source [DIR]', 'Source directory (defaults to ./)'
-global_option '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
-global_option '--safe', 'Safe mode (defaults to false)'
-global_option '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
-global_option '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
+  Jekyll::Command.subclasses.each { |c| c.init_with_program(p) }

-# Option names don't always directly match the configuration value we'd like.
-# This method will rename options to match what Jekyll configuration expects.
-#
-# options - The Hash of options from Commander.
-#
-# Returns the normalized Hash.
-def normalize_options(options)
-  if drafts_state = options.delete(:drafts)
-    options[:show_drafts] = drafts_state
-  end
-  options
-end
-
-def add_build_options(c)
-  c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-  c.option '--future', 'Publishes posts with a future date'
-  c.option '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
-  c.option '-w', '--watch', 'Watch for changes and rebuild'
-  c.option '--lsi', 'Use LSI for improved related posts'
-  c.option '-D', '--drafts', 'Render posts in the _drafts folder'
-  c.option '-V', '--verbose', 'Print verbose output.'
-end
-
-command :default do |c|
-  c.action do |args, options|
+  p.action do |args, options|
    if args.empty?
-      command(:help).run
+      puts p
    else
-      Jekyll.logger.abort_with "Invalid command. Use --help for more information"
+      unless p.has_command?(args.first)
+        Jekyll.logger.abort_with "Invalid command. Use --help for more information"
+      end
    end
  end
 end
-
-command :new do |c|
-  c.syntax = 'jekyll new PATH'
-  c.description = 'Creates a new Jekyll site scaffold in PATH'
-
-  c.option '--force', 'Force creation even if PATH already exists'
-  c.option '--blank', 'Creates scaffolding but with empty files'
-
-  c.action do |args, options|
-    Jekyll::Commands::New.process(args, options.__hash__)
-  end
-end
-
-command :build do |c|
-  c.syntax = 'jekyll build [options]'
-  c.description = 'Build your site'
-
-  add_build_options(c)
-
-  c.action do |args, options|
-    options = normalize_options(options.__hash__)
-    options = Jekyll.configuration(options)
-    Jekyll::Commands::Build.process(options)
-  end
-end
-
-command :serve do |c|
-  c.syntax = 'jekyll serve [options]'
-  c.description = 'Serve your site locally'
-
-  add_build_options(c)
-
-  c.option '-B', '--detach', 'Run the server in the background (detach)'
-  c.option '-P', '--port [PORT]', 'Port to listen on'
-  c.option '-H', '--host [HOST]', 'Host to bind to'
-  c.option '-b', '--baseurl [URL]', 'Base URL'
-
-  c.action do |args, options|
-    options.default :serving => true
-
-    options = normalize_options(options.__hash__)
-    options = Jekyll.configuration(options)
-    Jekyll::Commands::Build.process(options)
-    Jekyll::Commands::Serve.process(options)
-  end
-end
-alias_command :server, :serve
-
-command :doctor do |c|
-  c.syntax = 'jekyll doctor'
-  c.description = 'Search site and print specific deprecation warnings'
-
-  c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-
-  c.action do |args, options|
-    options = normalize_options(options.__hash__)
-    options = Jekyll.configuration(options)
-    Jekyll::Commands::Doctor.process(options)
-  end
-end
-alias_command :hyde, :doctor
-
-command :docs do |c|
-  c.syntax = 'jekyll docs'
-  c.description = "Launch local server with docs for Jekyll v#{Jekyll::VERSION}"
-
-  c.option '-p', '--port [PORT]', 'Port to listen on'
-  c.option '-u', '--host [HOST]', 'Host to bind to'
-
-  c.action do |args, options|
-    options = normalize_options(options.__hash__)
-    options = Jekyll.configuration(options.merge!({
-      'source' => File.expand_path("../site", File.dirname(__FILE__)),
-      'destination' => File.expand_path("../site/_site", File.dirname(__FILE__))
-    }))
-    puts options
-    Jekyll::Commands::Build.process(options)
-    Jekyll::Commands::Serve.process(options)
-  end
-end
-
-command :import do |c|
-  c.syntax = 'jekyll import <platform> [options]'
-  c.description = 'Import your old blog to Jekyll'
-
-  c.option '--source STRING', 'Source file or URL to migrate from'
-  c.option '--file STRING', 'File to migrate from'
-  c.option '--dbname STRING', 'Database name to migrate from'
-  c.option '--user STRING', 'Username to use when migrating'
-  c.option '--pass STRING', 'Password to use when migrating'
-  c.option '--host STRING', 'Host address to use when migrating'
-  c.option '--prefix STRING', 'Database table prefix to use when migrating'
-
-  c.action do |args, options|
-    begin
-      require 'jekyll-import'
-    rescue LoadError
-      msg  = "You must install the 'jekyll-import' gem before continuing.\n"
-      msg += "* Please see the documentation at http://jekyllrb.com/docs/migrations/ for instructions.\n"
-      abort msg
-    end
-    Jekyll::Commands::Import.process(args.first, options)
-  end
-end
--- a/docs/jp/CONTRIBUTING.jp.markdown
+++ b/docs/jp/CONTRIBUTING.jp.markdown
@@ -0,0 +1,93 @@
+コントリビュート
+==========
+
+あなたは Jekyll に投じるすばらしいアイディアを持っています。
+すばらしいことです！次の事柄を心に留めてください。
+
+* **テストなしではコントリビュートはできません。**
+* もし、既存の機能への小さな修正やパッチを作成したなら、シンプルなテストを行います。
+  現在のテストスイートの範囲にとどまり、そして
+  [Shoulda](http://github.com/thoughtbot/shoulda/tree/master) や
+  [RR](http://github.com/btakita/rr/tree/master) を使用してください。
+* もし、それが新しい機能の場合は、必ず新しい
+  [Cucumber](https://github.com/cucumber/cucumber/) の機能を作成し、
+  必要に応じて手順を再利用します。
+  また、あなたがフォークした `site` に
+  急ぎいくつかのドキュメントを用意し、一度マージを行い
+  メイン `site` の jekyllrb.com に転送していただければ幸いです。
+* あなたのコントリビュートによって Jekyll の振る舞いが変わった場合、ドキュメントを更新すべきです。
+  それは `site/docs` にあります。
+  もし、 docs に情報の誤りがあった場合、遠慮なく追加してください。
+  すばらしいドキュメントはすばらしいプロジェクトを作ります！
+* Ruby のコードを変更するときは、 [GitHub Ruby Styleguide](https://github.com/styleguide/ruby)
+  に従ってください。
+* **小さなプルリクエスト** に最善を尽くしてください。
+  簡単に提案された変更はレビューされ、マージされる可能性が高いです。
+* プルリクエストを送信するとき、プルリクエストのボディを賢明に使用してください。
+  変更されたかどうかの記述、変更の背後にある動機、 [完了したかどうかのタスクリスト](http://git.io/gfm-tasks)
+  もレビュー時間を早めます。
+
+テストの依存関係
+-----------------
+
+テストスイートの実行や gem のビルドのために、
+Jekyll の依存ツールをインストールする必要があります。
+Jekyll は Bundler を使用しており、 `bundle` コマンドを実行すると全ての設定が迅速に行われます！
+
+    $ bundle
+
+はじめる前に、テストを実行し、必ずテストが通ることを
+確認してください(あなたの環境が適切に設定されているかを確認するために):
+
+    $ bundle exec rake test
+    $ bundle exec rake features
+
+ワークフロー
+--------
+
+これは、あなたの作業がプロジェクトにマージされるもっとも直接的な方法です:
+
+* プロジェクトをフォークします。
+* あなたのフォークプロジェクトをクローンします ( `git clone git@github.com:<username>/jekyll.git` )。
+* トピックブランチを作成し、あなたの変更を含んでください ( `git checkout -b my_awesome_feature` )。
+* ハックし、テストを追加します。必ずしもこの順番でなくてかまいません
+* `rake` を実行し、テストが必ず全て通ることを確認してください
+* 必要に応じて、エラーがないようにコミットを論理的な塊にリベースしてください
+* ブランチをプッシュしてください ( `git push origin my_awesome_feature` ).
+* jekyll/jekyll プロジェクトの master ブランチに対してプルリクエストを作成し、
+  あなたの変更内容と、なぜそれをマージすべきかを記述してください
+
+ドキュメントの更新
+----------------------
+
+私たちは Jekyll のドキュメントについて最善を尽くしたいです。
+私たちはドキュメントをオープンソース化しました、そして
+あなたが Jekyll に欠けているものを見つけた場合、私たちはプルリクエストを歓迎しています。
+
+あなたは、 GitHub.com 上の Jekyll リポジトリの [site]({{ site.repository }}/tree/master/site) で
+jekyllrb.comのドキュメントを見つけることができます。
+
+全てのドキュメントのプルリクエストは `master` に向けられる必要があります。
+他のブランチに向けたプルリクエストは受け入れられません。
+
+GitHub の [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) は、
+自由に更新することができるように、プルリクエストなしで
+全ての GitHub ユーザがアクセス権を持つことができます。
+
+落とし穴
+-------
+
+* もし、 gem のバージョンがかちあった場合、コミットを分けてください。
+  この方法だと、メンテナが gem をリリースするときに制御できます。
+* jekyll/jekyll の最新コミットに基づいて(複数の)パッチを維持してください。
+  それは適用するためのあなたの仕事で、メンテナがしなければならないことを少なくするのは
+  とてもよいことです。
+* あなたの GitHub issue で [fix], [feature] などのタグをつけないでください。
+  メンテナは積極的に issue を読み、彼らが問題に出くわしたらラベルをつけるでしょう。
+
+最後に…
+----------
+
+ありがとう！ Jekyll のハックは楽しいものでなければなりません。
+もし、あなたがこのハードを理解するための何かを発見した場合、知らせてください。
+我々のプロセスやドキュメントを改善することができます！
--- a/docs/jp/README.jp.markdown
+++ b/docs/jp/README.jp.markdown
@@ -0,0 +1,69 @@
+# [Jekyll](http://jekyllrb.com/)
+
+[![Gem Version](https://badge.fury.io/rb/jekyll.png)](http://badge.fury.io/rb/jekyll)
+
+[![Build Status](https://secure.travis-ci.org/jekyll/jekyll.png?branch=master)](https://travis-ci.org/jekyll/jekyll)
+[![Code Climate](https://codeclimate.com/github/jekyll/jekyll.png)](https://codeclimate.com/github/jekyll/jekyll)
+[![Dependency Status](https://gemnasium.com/jekyll/jekyll.png)](https://gemnasium.com/jekyll/jekyll)
+[![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll)
+
+Tom Preston-Werner, Nick Quaranto や多くの[素晴らしいコントリビュータ](https://github.com/jekyll/jekyll/graphs/contributors)によって作成されています！
+
+Jekyll は個人プロジェクトや組織のサイトに最適な、シンプルで、ブログを意識した静的サイトジェネレータです。
+複雑さを排除したファイルベースのCMSのようなものと考えてください。
+Jekyll はコンテンツを受け取り、 Markdown や Liquid テンプレート をレンダリングし、
+Apache や Nginx やその他の Web サーバに提供する準備ができた静的な Web サイトを完全に出力してくれます。
+Jekyll は [GitHub Pages](http://pages.github.com) の背後にあるエンジンなので、
+あなたの GitHub リポジトリからサイトをホストするために使用する事ができます。
+
+## 原理
+
+Jekyll あなたがするように伝えたことをします ― それ以上でもそれ以下でもありません。
+それは、大胆な仮定によってユーザの裏をかこうとせず、
+また、不必要な複雑さや設定をユーザに負担しません。
+簡単に言えば、 Jekyll はあなたの道を開け、
+真に重要なもの: コンテンツに集中することができます。
+
+## 開始方法
+
+* gem を[インストール](http://jekyllrb.com/docs/installation/)します
+* [使用方法](http://jekyllrb.com/docs/usage/) と [設定方法](http://jekyllrb.com/docs/configuration/) を読みます
+* 既存の [Jekyll で作られたサイト](http://wiki.github.com/jekyll/jekyll/sites) をチラッと見ます
+* Fork し、あなたの変更を [コントリビュート](http://jekyllrb.com/docs/contributing/) します
+* 質問があったら？ irc.freenode.net の `#jekyll` チャンネルをチェックしてください
+
+## より深く
+
+* 以前のシステムからの[移行](http://jekyllrb.com/docs/migrations/)
+* [YAML Front Matter](http://jekyllrb.com/docs/frontmatter/) がどのように働くかを学ぶ
+* [変数](http://jekyllrb.com/docs/variables/)を使ってサイトに情報を表示する
+* posts が生成される時の[パーマリンク](http://jekyllrb.com/docs/permalinks/)をカスタマイズ
+* 人生を容易にするために、組み込みの [Liquid 拡張](http://jekyllrb.com/docs/templates/)を使用する
+* あなたのサイト固有のコンテンツを生成するために、カスタム[プラグイン](http://jekyllrb.com/docs/plugins/)を使用する
+
+## 実行時の依存関係
+
+* Commander: コマンドラインインターフェース構築 (Ruby)
+* Colorator: コマンドライン出力に色付け (Ruby)
+* Classifier: posts の関連を生成 (Ruby)
+* Directory Watcher: サイトの自動再生成 (Ruby)
+* Kramdown: デフォルトの Markdown エンジン (Ruby)
+* Liquid: テンプレートシステム (Ruby)
+* Pygments.rb: シンタックスハイライト (Ruby/Python)
+* RedCarpet: Markdown エンジン (Ruby)
+* Safe YAML: セキュリティのために構築された YAML パーサ (Ruby)
+
+## 開発時の依存関係
+
+* Launchy: クロスプラットフォーム ファイルランチャ (Ruby)
+* Maruku: Markdown スーパーセット インタプリタ (Ruby)
+* RDiscount: Discount Markdown プロセッサ (Ruby)
+* RedCloth: Textile サポート (Ruby)
+* RedGreen: よりよいテスト出力 (Ruby)
+* RR: モック (Ruby)
+* Shoulda: テストフレームワーク (Ruby)
+* SimpleCov: カバレッジフレームワーク (Ruby)
+
+## ライセンス
+
+[ライセンス](https://github.com/jekyll/jekyll/blob/master/LICENSE)を見てください。
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -0,0 +1,96 @@
+Feature: Collections
+  As a hacker who likes to structure content
+  I want to be able to create collections of similar information
+  And render them
+
+  Scenario: Unrendered collection
+    Given I have an "index.html" page that contains "Collections: {{ site.methods }}"
+    And I have fixture collections
+    And I have a configuration file with "collections" set to "['methods']"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Collections: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>\n<p><code>Jekyll.sanitized_path</code> is used to make sure your path is in your source.</p>\n<p>Run your generators! default</p>\n<p>Create dat site.</p>\n<p>Run your generators! default</p>" in "_site/index.html"
+    And the "_site/methods/configuration.html" file should not exist
+
+  Scenario: Rendered collection
+    Given I have an "index.html" page that contains "Collections: {{ site.collections }}"
+    And I have an "collection_metadata.html" page that contains "Methods metadata: {{ site.collections.methods.foo }} {{ site.collections.methods }}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      methods:
+        output: true
+        foo:   bar
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Collections: {\"methods" in "_site/index.html"
+    And I should see "Methods metadata: bar" in "_site/collection_metadata.html"
+    And I should see "<p>Whatever: foo.bar</p>" in "_site/methods/configuration.html"
+
+  Scenario: Rendered document in a layout
+    Given I have an "index.html" page that contains "Collections: {{ site.collections }}"
+    And I have a default layout that contains "<div class='title'>Tom Preston-Werner</div> {{content}}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      methods:
+        output: true
+        foo:   bar
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Collections: {\"methods" in "_site/index.html"
+    And I should see "<p>Run your generators! default</p>" in "_site/methods/site/generate.html"
+    And I should see "<div class='title'>Tom Preston-Werner</div>" in "_site/methods/site/generate.html"
+
+  Scenario: Collections specified as an array
+    Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+    - methods
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Collections: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+
+  Scenario: Collections specified as an hash
+    Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      methods:
+        baz: bin
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Collections: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+
+  Scenario: All the documents
+    Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+    - methods
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "All documents: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+
+  Scenario: Documents have an output attribute, which is the converted HTML
+    Given I have an "index.html" page that contains "First document's output: {{ site.documents.first.output }}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+    - methods
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "First document's output: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>" in "_site/index.html"
--- a/features/create_sites.feature
+++ b/features/create_sites.feature
@@ -5,23 +5,23 @@ Feature: Create sites

  Scenario: Blank site
    Given I do not have a "test_blank" directory
-    When I call jekyll new with test_blank --blank
+    When I run jekyll new test_blank --blank
    Then the test_blank/_layouts directory should exist
    And the test_blank/_posts directory should exist
    And the "test_blank/index.html" file should exist

  Scenario: Basic site
    Given I have an "index.html" file that contains "Basic Site"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Basic Site" in "_site/index.html"

  Scenario: Basic site with a post
    Given I have a _posts directory
    And I have the following post:
-      | title   | date      | content          |
+      | title   | date       | content          |
      | Hackers | 2009-03-27 | My First Exploit |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "My First Exploit" in "_site/2009/03/27/hackers.html"

@@ -29,7 +29,7 @@ Feature: Create sites
    Given I have a _layouts directory
    And I have an "index.html" page with layout "default" that contains "Basic Site with Layout"
    And I have a default layout that contains "Page Layout: {{ content }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Page Layout: Basic Site with Layout" in "_site/index.html"

@@ -37,10 +37,10 @@ Feature: Create sites
    Given I have a _layouts directory
    And I have a _posts directory
    And I have the following posts:
-      | title    | date      | layout  | content                               |
+      | title    | date       | layout  | content                               |
      | Wargames | 2009-03-27 | default | The only winning move is not to play. |
    And I have a default layout that contains "Post Layout: {{ content }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"

@@ -48,10 +48,10 @@ Feature: Create sites
    Given I have a _layouts directory
    And I have a _posts directory
    And I have the following posts:
-      | title    | date      | layout  | content                               |
+      | title    | date       | layout      | content                               |
      | Wargames | 2009-03-27 | post/simple | The only winning move is not to play. |
    And I have a post/simple layout that contains "Post Layout: {{ content }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"

@@ -66,15 +66,15 @@ Feature: Create sites
    And I have an "another_file" file that contains ""
    And I have a _posts directory
    And I have the following posts:
-      | title     | date      | layout  | content                                |
-      | entry1    | 2009-03-27 | post    | content for entry1.                    |
-      | entry2    | 2009-04-27 | post    | content for entry2.                    |
+      | title  | date       | layout | content             |
+      | entry1 | 2009-03-27 | post   | content for entry1. |
+      | entry2 | 2009-04-27 | post   | content for entry2. |
    And I have a category/_posts directory
    And I have the following posts in "category":
-      | title     | date      | layout  | content                                |
-      | entry3    | 2009-05-27 | post    | content for entry3.                    |
-      | entry4    | 2009-06-27 | post    | content for entry4.                    |
-    When I run jekyll
+      | title  | date       | layout | content             |
+      | entry3 | 2009-05-27 | post   | content for entry3. |
+      | entry4 | 2009-06-27 | post   | content for entry4. |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Page : Site contains 2 pages and 4 posts" in "_site/index.html"
    And I should see "No replacement \{\{ site.posts.size \}\}" in "_site/about.html"
@@ -89,7 +89,7 @@ Feature: Create sites
    Given I have a _includes directory
    And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
    And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"

@@ -98,7 +98,7 @@ Feature: Create sites
    And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
    And I have an info directory
    And I have an "info/index.html" page that contains "Basic Site with subdir include tag: {% include about.textile %}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Basic Site with subdir include tag: Generated by Jekyll" in "_site/info/index.html"

@@ -107,7 +107,7 @@ Feature: Create sites
    And I have an "_includes/about.textile" file that contains "Generated by {% include jekyll.textile %}"
    And I have an "_includes/jekyll.textile" file that contains "Jekyll"
    And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"

@@ -116,26 +116,43 @@ Feature: Create sites
    And I have a configuration file with "permalink" set to "pretty"
    And I have a _posts directory
    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | entry1    | 2007-12-31 | post    | content for entry1.                    |
-      | entry2    | 2020-01-31 | post    | content for entry2.                    |
-    When I run jekyll
+      | title  | date       | layout | content             |
+      | entry1 | 2007-12-31 | post   | content for entry1. |
+      | entry2 | 2020-01-31 | post   | content for entry2. |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "URL: /2020/01/31/entry2/" in "_site/index.html"

  Scenario: Basic site with whitelisted dotfile
    Given I have an ".htaccess" file that contains "SomeDirective"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "SomeDirective" in "_site/.htaccess"

  Scenario: File was replaced by a directory
    Given I have a "test" file that contains "some stuff"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    When I delete the file "test"
    Given I have a test directory
    And I have a "test/index.html" file that contains "some other stuff"
-    When I run jekyll
+    When I run jekyll build
    Then the _site/test directory should exist
    And I should see "some other stuff" in "_site/test/index.html"
+
+  Scenario: Basic site with unpublished page
+    Given I have an "index.html" page with title "index" that contains "Published page"
+    And I have a "public.html" page with published "true" that contains "Explicitly published page"
+    And I have a "secret.html" page with published "false" that contains "Unpublished page"
+
+    When I run jekyll build
+    Then the _site directory should exist
+    And the "_site/index.html" file should exist
+    And the "_site/public.html" file should exist
+    But the "_site/secret.html" file should not exist
+
+    When I run jekyll build --unpublished
+    Then the _site directory should exist
+    And the "_site/index.html" file should exist
+    And the "_site/public.html" file should exist
+    And the "_site/secret.html" file should exist
--- a/features/data.feature
+++ b/features/data.feature
@@ -13,7 +13,7 @@ Feature: Data
        price: 2.5
      """
    And I have an "index.html" page that contains "{% for product in site.data.products %}{{product.name}}{% endfor %}"
-    When I run jekyll
+    When I run jekyll build
    Then the "_site/index.html" file should exist
    And I should see "sugar" in "_site/index.html"
    And I should see "salt" in "_site/index.html"
@@ -28,7 +28,7 @@ Feature: Data
        age: 34
      """
    And I have an "index.html" page that contains "{% for member in site.data.members %}{{member.name}}{% endfor %}"
-    When I run jekyll
+    When I run jekyll build
    Then the "_site/index.html" file should exist
    And I should see "Jack" in "_site/index.html"
    And I should see "Leon" in "_site/index.html"
@@ -43,7 +43,7 @@ Feature: Data
        age: 34
      """
    And I have an "index.html" page that contains "{% for member in site.data.team_members %}{{member.name}}{% endfor %}"
-    When I run jekyll
+    When I run jekyll build
    Then the "_site/index.html" file should exist
    And I should see "Jack" in "_site/index.html"
    And I should see "Leon" in "_site/index.html"
@@ -58,7 +58,7 @@ Feature: Data
          age: 34
      """
    And I have an "index.html" page that contains "{% for member in site.data %}{{member.name}}{% endfor %}"
-    When I run jekyll
+    When I run jekyll build
    Then the "_site/index.html" file should exist
    And I should see "Jack" in "_site/index.html"
    And I should see "Leon" in "_site/index.html"
--- a/features/drafts.feature
+++ b/features/drafts.feature
@@ -7,9 +7,9 @@ Feature: Draft Posts
    Given I have a configuration file with "permalink" set to "none"
    And I have a _drafts directory
    And I have the following draft:
-      | title  | date      | layout  | content        |
+      | title  | date       | layout  | content        |
      | Recipe | 2009-03-27 | default | Not baked yet. |
-    When I run jekyll with drafts
+    When I run jekyll build --drafts
    Then the _site directory should exist
    And I should see "Not baked yet." in "_site/recipe.html"

@@ -18,8 +18,29 @@ Feature: Draft Posts
    And I have an "index.html" page that contains "Totally index"
    And I have a _drafts directory
    And I have the following draft:
-      | title  | date      | layout  | content        |
+      | title  | date       | layout  | content        |
      | Recipe | 2009-03-27 | default | Not baked yet. |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And the "_site/recipe.html" file should not exist
+
+  Scenario: Don't preview a draft that is not published
+    Given I have a configuration file with "permalink" set to "none"
+    And I have an "index.html" page that contains "Totally index"
+    And I have a _drafts directory
+    And I have the following draft:
+      | title  | date       | layout  | published | content        |
+      | Recipe | 2009-03-27 | default | false     | Not baked yet. |
+    When I run jekyll build --drafts
+    Then the _site directory should exist
+    And the "_site/recipe.html" file should not exist
+
+  Scenario: Use page.path variable
+    Given I have a configuration file with "permalink" set to "none"
+    And I have a _drafts directory
+    And I have the following draft:
+      | title  | date       | layout | content                    |
+      | Recipe | 2009-03-27 | simple | Post path: {{ page.path }} |
+    When I run jekyll build --drafts
+    Then the _site directory should exist
+    And I should see "Post path: _drafts/recipe.textile" in "_site/recipe.html"
--- a/features/embed_filters.feature
+++ b/features/embed_filters.feature
@@ -7,10 +7,10 @@ Feature: Embed filters
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout  | content                                     |
+      | title     | date       | layout  | content                                     |
      | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
    And I have a default layout that contains "{{ site.time | date_to_xmlschema }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see today's date in "_site/2009/03/27/star-wars.html"

@@ -18,10 +18,12 @@ Feature: Embed filters
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title       | date      | layout  | content                                     |
+      | title       | date       | layout  | content                                     |
      | Star & Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
+
+
    And I have a default layout that contains "{{ page.title | xml_escape }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Star &amp; Wars" in "_site/2009/03/27/star-wars.html"

@@ -29,10 +31,10 @@ Feature: Embed filters
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout  | content                                     |
+      | title     | date       | layout  | content                                     |
      | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
    And I have a default layout that contains "{{ content | xml_escape }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "7" in "_site/2009/03/27/star-wars.html"

@@ -40,10 +42,10 @@ Feature: Embed filters
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout  | tags                   | content                                     |
+      | title     | date       | layout  | tags                   | content                                     |
      | Star Wars | 2009-03-27 | default | [scifi, movies, force] | These aren't the droids you're looking for. |
    And I have a default layout that contains "{{ page.tags | array_to_sentence_string }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "scifi, movies, and force" in "_site/2009/03/27/star-wars.html"

@@ -51,10 +53,55 @@ Feature: Embed filters
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout  | content                                      |
+      | title     | date       | layout  | content                                     |
      | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
    And I have a default layout that contains "By {{ '_Obi-wan_' | textilize }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "By <p><em>Obi-wan</em></p>" in "_site/2009/03/27/star-wars.html"

+  Scenario: Sort by an arbitrary variable
+    Given I have a _layouts directory
+    And I have the following page:
+      | title  | layout  | value | content   |
+      | Page-1 | default | 8     | Something |
+    And I have the following page:
+      | title  | layout  | value | content   |
+      | Page-2 | default | 6     | Something |
+    And I have a default layout that contains "{{ site.pages | sort:'value' | map:'title' | join:', ' }}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see exactly "Page-2, Page-1" in "_site/page-1.html"
+    And I should see exactly "Page-2, Page-1" in "_site/page-2.html"
+
+  Scenario: Sort pages by the title
+    Given I have a _layouts directory
+    And I have the following page:
+      | title | layout | content |
+      | Dog | default | Run |
+    And I have the following page:
+      | title | layout | content |
+      | Bird | default | Fly |
+    And I have the following page:
+      | layout | content |
+      | default | Jump |
+    And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see exactly "The rule of 3: Jump, Fly, Run," in "_site/bird.html"
+
+  Scenario: Sort pages by the title ordering pages without title last
+    Given I have a _layouts directory
+    And I have the following page:
+      | title | layout | content |
+      | Dog | default | Run |
+    And I have the following page:
+      | title | layout | content |
+      | Bird | default | Fly |
+    And I have the following page:
+      | layout | content |
+      | default | Jump |
+    And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title', 'last' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see exactly "The rule of 3: Fly, Run, Jump," in "_site/bird.html"
--- a/features/frontmatter_defaults.feature
+++ b/features/frontmatter_defaults.feature
@@ -0,0 +1,79 @@
+Feature: frontmatter defaults
+  Scenario: Use default for frontmatter variables internally
+    Given I have a _layouts directory
+    And I have a pretty layout that contains "THIS IS THE LAYOUT: {{content}}"
+
+    And I have a _posts directory
+    And I have the following post:
+      | title             | date       | content          |
+      | default layout    | 2013-09-11 | just some post   |
+    And I have an "index.html" page with title "some title" that contains "just some page"
+
+    And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {layout: "pretty"}}]"
+
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "THIS IS THE LAYOUT: <p>just some post</p>" in "_site/2013/09/11/default-layout.html"
+    And I should see "THIS IS THE LAYOUT: just some page" in "_site/index.html"
+
+  Scenario: Use default for frontmatter variables in Liquid
+    Given I have a _posts directory
+    And I have the following post:
+      | title        | date       | content                                          |
+      | default data | 2013-09-11 | <p>{{page.custom}}</p><div>{{page.author}}</div> |
+    And I have an "index.html" page that contains "just {{page.custom}} by {{page.author}}"
+    And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {custom: "some special data", author: "Ben"}}]"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "<p>some special data</p><div>Ben</div>" in "_site/2013/09/11/default-data.html"
+    And I should see "just some special data by Ben" in "_site/index.html"
+
+  Scenario: Override frontmatter defaults by path
+    Given I have a _layouts directory
+    And I have a root layout that contains "root: {{ content }}"
+    And I have a subfolder layout that contains "subfolder: {{ content }}"
+
+    And I have a _posts directory
+    And I have the following post:
+      | title | date       | content               |
+      | about | 2013-10-14 | info on {{page.description}} |
+    And I have a special/_posts directory
+    And I have the following post in "special":
+      | title | date       | path  | content               |
+      | about | 2013-10-14 | local | info on {{page.description}} |
+
+    And I have an "index.html" page with title "overview" that contains "Overview for {{page.description}}"
+    And I have an "special/index.html" page with title "section overview" that contains "Overview for {{page.description}}"
+
+    And I have a configuration file with "defaults" set to "[{scope: {path: "special"}, values: {layout: "subfolder", description: "the special section"}}, {scope: {path: ""}, values: {layout: "root", description: "the webpage"}}]"
+
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "root: <p>info on the webpage</p>" in "_site/2013/10/14/about.html"
+    And I should see "subfolder: <p>info on the special section</p>" in "_site/special/2013/10/14/about.html"
+    And I should see "root: Overview for the webpage" in "_site/index.html"
+    And I should see "subfolder: Overview for the special section" in "_site/special/index.html"
+
+  Scenario: Override frontmatter defaults by type
+    Given I have a _posts directory
+    And I have the following post:
+      | title          | date       | content |
+      | this is a post | 2013-10-14 | blabla  |
+    And I have an "index.html" page that contains "interesting stuff"
+    And I have a configuration file with "defaults" set to "[{scope: {path: "", type: "post"}, values: {permalink: "/post.html"}}, {scope: {path: "", type: "page"}, values: {permalink: "/page.html"}}, {scope: {path: ""}, values: {permalink: "/perma.html"}}]"
+    When I run jekyll build
+    Then I should see "blabla" in "_site/post.html"
+    And I should see "interesting stuff" in "_site/page.html"
+    But the "_site/perma.html" file should not exist
+
+  Scenario: Actual frontmatter overrides defaults
+    Given I have a _posts directory
+    And I have the following post:
+      | title    | date       | permalink         | author   | content                   |
+      | override | 2013-10-14 | /frontmatter.html | some guy | a blog by {{page.author}} |
+    And I have an "index.html" page with permalink "override.html" that contains "nothing"
+    And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {permalink: "/perma.html", author: "Chris"}}]"
+    When I run jekyll build
+    Then I should see "a blog by some guy" in "_site/frontmatter.html"
+    And I should see "nothing" in "_site/override.html"
+    But the "_site/perma.html" file should not exist
--- a/features/include_tag.feature
+++ b/features/include_tag.feature
@@ -10,15 +10,15 @@ Feature: Include tags
    And I have an "_includes/ignore.html" file that contains "<footer>My blog footer</footer>"
    And I have a _posts directory
    And I have the following post:
-      | title                               | date       | layout  | content |
-      | Include Files                       | 2013-03-21 | default | {% include header.html param="myparam" %} |
-      | Ignore params if unused             | 2013-03-21 | default | {% include ignore.html date="today" %} |
-      | List multiple parameters            | 2013-03-21 | default | {% include params.html date="today" start="tomorrow" %} |
-      | Dont keep parameters                | 2013-03-21 | default | {% include ignore.html param="test" %}\n{% include header.html %} |
+      | title                               | date       | layout  | content                                                                                                                 |
+      | Include Files                       | 2013-03-21 | default | {% include header.html param="myparam" %}                                                                               |
+      | Ignore params if unused             | 2013-03-21 | default | {% include ignore.html date="today" %}                                                                                  |
+      | List multiple parameters            | 2013-03-21 | default | {% include params.html date="today" start="tomorrow" %}                                                                 |
+      | Dont keep parameters                | 2013-03-21 | default | {% include ignore.html param="test" %}\n{% include header.html %}                                                       |
      | Allow params with spaces and quotes | 2013-04-07 | default | {% include params.html cool="param with spaces" super="\"quoted\"" single='has "quotes"' escaped='\'single\' quotes' %} |
-      | Parameter syntax                    | 2013-04-12 | default | {% include params.html param1_or_2="value" %} |
-      | Pass a variable                     | 2013-06-22 | default | {% assign var = 'some text' %}{% include params.html local=var layout=page.layout %} |
-    When I run jekyll
+      | Parameter syntax                    | 2013-04-12 | default | {% include params.html param1_or_2="value" %}                                                                           |
+      | Pass a variable                     | 2013-06-22 | default | {% assign var = 'some text' %}{% include params.html local=var layout=page.layout %}                                    |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "<header>My awesome blog header: myparam</header>" in "_site/2013/03/21/include-files.html"
    And I should not see "myparam" in "_site/2013/03/21/ignore-params-if-unused.html"
@@ -43,7 +43,7 @@ Feature: Include tags
    | include_file1 | snippet.html      |
    | include_file2 | parametrized.html |
    And I have an "index.html" page that contains "{% include {{site.include_file1}} %} that {% include {{site.include_file2}} what='parameters' %}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "a snippet that works with parameters" in "_site/index.html"

@@ -52,6 +52,17 @@ Feature: Include tags
    And I have an "_includes/one.html" file that contains "one"
    And I have an "_includes/two.html" file that contains "two"
    And I have an "index.html" page with files "[one.html, two.html]" that contains "{% for file in page.files %}{% include {{file}} %} {% endfor %}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "one two" in "_site/index.html"
+
+  Scenario: Include a file with variables and filters
+    Given I have an _includes directory
+    And I have an "_includes/one.html" file that contains "one included"
+    And I have a configuration file with:
+    | key          | value |
+    | include_file | one   |
+    And I have an "index.html" page that contains "{% include {{ site.include_file | append: '.html' }} %}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "one included" in "_site/index.html"
--- a/features/markdown.feature
+++ b/features/markdown.feature
@@ -8,23 +8,60 @@ Feature: Markdown
    And I have an "index.html" page that contains "Index - {% for post in site.posts %} {{ post.content }} {% endfor %}"
    And I have a _posts directory
    And I have the following post:
-      | title   | date      | content    | type     |
+      | title   | date       | content    | type     |
      | Hackers | 2009-03-27 | # My Title | markdown |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Index" in "_site/index.html"
-    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/2009/03/27/hackers.html"
-    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/index.html"
+    And I should see "<h1 id=\"my-title\">My Title</h1>" in "_site/2009/03/27/hackers.html"
+    And I should see "<h1 id=\"my-title\">My Title</h1>" in "_site/index.html"

  Scenario: Markdown in pagination on index
    Given I have a configuration file with "paginate" set to "5"
    And I have an "index.html" page that contains "Index - {% for post in paginator.posts %} {{ post.content }} {% endfor %}"
    And I have a _posts directory
    And I have the following post:
-      | title   | date      | content    | type     |
+      | title   | date       | content    | type     |
      | Hackers | 2009-03-27 | # My Title | markdown |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Index" in "_site/index.html"
-    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/index.html"
-    
+    And I should see "<h1 id=\"my-title\">My Title</h1>" in "_site/index.html"
+
+  Scenario: Maruku fenced codeblocks
+    Given I have a configuration file with "markdown" set to "maruku"
+    And I have an "index.markdown" file with content:
+       """
+       ---
+       title: My title
+       ---
+
+       # My title
+
+       ```
+       My awesome code
+       ```
+       """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "My awesome code" in "_site/index.html"
+    And I should see "<pre><code>\nMy awesome code\n</code></pre>" in "_site/index.html"
+
+  Scenario: Maruku fenced codeblocks
+    Given I have a configuration file with "markdown" set to "maruku"
+    And I have an "index.markdown" file with content:
+       """
+       ---
+       title: My title
+       ---
+
+       # My title
+
+       ```ruby
+       puts "My awesome string"
+       ```
+       """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "My awesome string" in "_site/index.html"
+    And I should see "<pre class="ruby"><code class="ruby">\nputs &quot;My awesome string&quot;\n</code></pre>" in "_site/index.html"
--- a/features/pagination.feature
+++ b/features/pagination.feature
@@ -9,12 +9,12 @@ Feature: Site pagination
    And I have an "index.html" page that contains "{{ paginator.posts.size }}"
    And I have a _posts directory
    And I have the following posts:
-      | title     | date      | layout  | content                                |
+      | title     | date       | layout  | content                                |
      | Wargames  | 2009-03-27 | default | The only winning move is not to play.  |
      | Wargames2 | 2009-04-27 | default | The only winning move is not to play2. |
      | Wargames3 | 2009-05-27 | default | The only winning move is not to play3. |
      | Wargames4 | 2009-06-27 | default | The only winning move is not to play4. |
-    When I run jekyll
+    When I run jekyll build
    Then the _site/page<exist> directory should exist
    And the "_site/page<exist>/index.html" file should exist
    And I should see "<posts>" in "_site/page<exist>/index.html"
@@ -36,12 +36,12 @@ Feature: Site pagination
    And I have an "blog/index.html" page that contains "{{ paginator.posts.size }}"
    And I have a _posts directory
    And I have the following posts:
-      | title     | date      | layout  | content                                |
+      | title     | date       | layout  | content                                |
      | Wargames  | 2009-03-27 | default | The only winning move is not to play.  |
      | Wargames2 | 2009-04-27 | default | The only winning move is not to play2. |
      | Wargames3 | 2009-05-27 | default | The only winning move is not to play3. |
      | Wargames4 | 2009-06-27 | default | The only winning move is not to play4. |
-    When I run jekyll
+    When I run jekyll build
    Then the _site/blog/page-<exist> directory should exist
    And the "_site/blog/page-<exist>/index.html" file should exist
    And I should see "<posts>" in "_site/blog/page-<exist>/index.html"
@@ -69,7 +69,7 @@ Feature: Site pagination
      | Wargames2 | 2009-04-27 | default | The only winning move is not to play2. |
      | Wargames3 | 2009-05-27 | default | The only winning move is not to play3. |
      | Wargames4 | 2009-06-27 | default | The only winning move is not to play4. |
-    When I run jekyll
+    When I run jekyll build
    Then the _site/blog/page/<exist> directory should exist
    And the "_site/blog/page/<exist>/index.html" file should exist
    And I should see "<posts>" in "_site/blog/page/<exist>/index.html"
--- a/features/permalinks.feature
+++ b/features/permalinks.feature
@@ -6,20 +6,20 @@ Feature: Fancy permalinks
  Scenario: Use none permalink schema
    Given I have a _posts directory
    And I have the following post:
-      | title                 | date      | content          |
+      | title                 | date       | content          |
      | None Permalink Schema | 2009-03-27 | Totally nothing. |
    And I have a configuration file with "permalink" set to "none"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Totally nothing." in "_site/none-permalink-schema.html"

  Scenario: Use pretty permalink schema
    Given I have a _posts directory
    And I have the following post:
-      | title                   | date      | content            |
+      | title                   | date       | content            |
      | Pretty Permalink Schema | 2009-03-27 | Totally wordpress. |
    And I have a configuration file with "permalink" set to "pretty"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Totally wordpress." in "_site/2009/03/27/pretty-permalink-schema/index.html"

@@ -28,7 +28,7 @@ Feature: Fancy permalinks
    And I have an "awesome.html" page that contains "Totally awesome"
    And I have an "sitemap.xml" page that contains "Totally uhm, sitemap"
    And I have a configuration file with "permalink" set to "pretty"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Totally index" in "_site/index.html"
    And I should see "Totally awesome" in "_site/awesome/index.html"
@@ -37,39 +37,39 @@ Feature: Fancy permalinks
  Scenario: Use custom permalink schema with prefix
    Given I have a _posts directory
    And I have the following post:
-      | title                   | category | date      | content         |
+      | title                   | category | date       | content         |
      | Custom Permalink Schema | stuff    | 2009-03-27 | Totally custom. |
    And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Totally custom." in "_site/blog/2009/03/27/custom-permalink-schema/index.html"

  Scenario: Use custom permalink schema with category
    Given I have a _posts directory
    And I have the following post:
-      | title                   | category | date      | content         |
+      | title                   | category | date       | content         |
      | Custom Permalink Schema | stuff    | 2009-03-27 | Totally custom. |
    And I have a configuration file with "permalink" set to "/:categories/:title.html"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Totally custom." in "_site/stuff/custom-permalink-schema.html"

  Scenario: Use custom permalink schema with squished date
    Given I have a _posts directory
    And I have the following post:
-      | title                   | category | date      | content         |
+      | title                   | category | date       | content         |
      | Custom Permalink Schema | stuff    | 2009-03-27 | Totally custom. |
    And I have a configuration file with "permalink" set to "/:month-:day-:year/:title.html"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Totally custom." in "_site/03-27-2009/custom-permalink-schema.html"

  Scenario: Use per-post permalink
    Given I have a _posts directory
    And I have the following post:
-      | title     | date      | permalink       | content |
+      | title     | date       | permalink       | content |
      | Some post | 2013-04-14 | /custom/posts/1 | bla bla |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And the _site/custom/posts/1 directory should exist
    And I should see "bla bla" in "_site/custom/posts/1/index.html"
@@ -77,9 +77,9 @@ Feature: Fancy permalinks
  Scenario: Use per-post ending in .html
    Given I have a _posts directory
    And I have the following post:
-      | title     | date      | permalink               | content |
+      | title     | date       | permalink               | content |
      | Some post | 2013-04-14 | /custom/posts/some.html | bla bla |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And the _site/custom/posts directory should exist
    And I should see "bla bla" in "_site/custom/posts/some.html"
--- a/features/post_data.feature
+++ b/features/post_data.feature
@@ -7,10 +7,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | content                 |
+      | title     | date       | layout | content                 |
      | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
    And I have a simple layout that contains "Post title: {{ page.title }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post title: Star Wars" in "_site/2009/03/27/star-wars.html"

@@ -18,10 +18,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | content                 |
+      | title     | date       | layout | content                 |
      | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
    And I have a simple layout that contains "Post url: {{ page.url }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post url: /2009/03/27/star-wars.html" in "_site/2009/03/27/star-wars.html"

@@ -29,10 +29,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | content                 |
+      | title     | date       | layout | content                 |
      | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
    And I have a simple layout that contains "Post date: {{ page.date | date_to_string }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post date: 27 Mar 2009" in "_site/2009/03/27/star-wars.html"

@@ -40,10 +40,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | content                 |
+      | title     | date       | layout | content                 |
      | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
    And I have a simple layout that contains "Post id: {{ page.id }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post id: /2009/03/27/star-wars" in "_site/2009/03/27/star-wars.html"

@@ -51,10 +51,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | content                 |
+      | title     | date       | layout | content                 |
      | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
    And I have a simple layout that contains "Post content: {{ content }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post content: <p>Luke, I am your father.</p>" in "_site/2009/03/27/star-wars.html"

@@ -63,10 +63,10 @@ Feature: Post data
    And I have a movies/_posts directory
    And I have a _layouts directory
    And I have the following post in "movies":
-      | title     | date      | layout | content                 |
+      | title     | date       | layout | content                 |
      | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
    And I have a simple layout that contains "Post category: {{ page.categories }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"

@@ -74,10 +74,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | tag   | content                 |
+      | title     | date       | layout | tag   | content                 |
      | Star Wars | 2009-05-18 | simple | twist | Luke, I am your father. |
    And I have a simple layout that contains "Post tags: {{ page.tags }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post tags: twist" in "_site/2009/05/18/star-wars.html"

@@ -87,10 +87,10 @@ Feature: Post data
    And I have a scifi/movies/_posts directory
    And I have a _layouts directory
    And I have the following post in "scifi/movies":
-      | title     | date      | layout | content                 |
+      | title     | date       | layout | content                 |
      | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
    And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"

@@ -100,10 +100,10 @@ Feature: Post data
    And I have a scifi/Movies/_posts directory
    And I have a _layouts directory
    And I have the following post in "scifi/Movies":
-      | title     | date      | layout | content                 |
+      | title     | date       | layout | content                 |
      | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
    And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"

@@ -111,10 +111,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | category | content                 |
+      | title     | date       | layout | category | content                 |
      | Star Wars | 2009-03-27 | simple | movies   | Luke, I am your father. |
    And I have a simple layout that contains "Post category: {{ page.categories }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"

@@ -122,10 +122,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | category | content                 |
+      | title     | date       | layout | category | content                 |
      | Star Wars | 2009-03-27 | simple | Movies   | Luke, I am your father. |
    And I have a simple layout that contains "Post category: {{ page.categories }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"

@@ -133,10 +133,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | category | content                 |
+      | title     | date       | layout | category | content                 |
      | Star Wars | 2009-03-27 | simple | movies   | Luke, I am your father. |
    And I have a simple layout that contains "Post category: {{ page.categories }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"

@@ -144,11 +144,11 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following posts:
-      | title     | date      | layout | categories          | content                     |
+      | title     | date       | layout | categories          | content                     |
      | Star Wars | 2009-03-27 | simple | ['scifi', 'Movies'] | Luke, I am your father.     |
      | Star Trek | 2013-03-17 | simple | ['SciFi', 'movies'] | Jean Luc, I am your father. |
    And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2013/03/17/star-trek.html"
@@ -156,24 +156,24 @@ Feature: Post data
  Scenario Outline: Use page.path variable
    Given I have a <dir>/_posts directory
    And I have the following post in "<dir>":
-      | title | type | date | content |
+      | title   | type | date       | content                      |
      | my-post | html | 2013-04-12 | Source path: {{ page.path }} |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Source path: <path_prefix>_posts/2013-04-12-my-post.html" in "_site/<dir>/2013/04/12/my-post.html"

    Examples:
-      | dir | path_prefix |
-      | .   |             |
-      | dir | dir/        |
+      | dir        | path_prefix |
+      | .          |             |
+      | dir        | dir/        |
      | dir/nested | dir/nested/ |

  Scenario: Override page.path variable
    Given I have a _posts directory
    And I have the following post:
-      | title    | date      | path               | content                      |
+      | title    | date       | path               | content                      |
      | override | 2013-04-12 | override-path.html | Custom path: {{ page.path }} |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Custom path: override-path.html" in "_site/2013/04/12/override.html"

@@ -181,9 +181,9 @@ Feature: Post data
    Given I have a _posts directory
    And I have an "index.html" file that contains "Published!"
    And I have the following post:
-      | title     | date      | layout | published | content                 |
+      | title     | date       | layout | published | content                 |
      | Star Wars | 2009-03-27 | simple | false     | Luke, I am your father. |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And the "_site/2009/03/27/star-wars.html" file should not exist
    And I should see "Published!" in "_site/index.html"
@@ -192,10 +192,10 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following post:
-      | title     | date      | layout | author      | content                 |
+      | title     | date       | layout | author      | content                 |
      | Star Wars | 2009-03-27 | simple | Darth Vader | Luke, I am your father. |
    And I have a simple layout that contains "Post author: {{ page.author }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Post author: Darth Vader" in "_site/2009/03/27/star-wars.html"

@@ -203,12 +203,12 @@ Feature: Post data
    Given I have a _posts directory
    And I have a _layouts directory
    And I have the following posts:
-      | title            | date      | layout  | author      | content                 |
+      | title            | date       | layout  | author      | content                 |
      | Star Wars        | 2009-03-27 | ordered | Darth Vader | Luke, I am your father. |
      | Some like it hot | 2009-04-27 | ordered | Osgood      | Nobody is perfect.      |
      | Terminator       | 2009-05-27 | ordered | Arnold      | Sayonara, baby          |
    And I have a ordered layout that contains "Previous post: {{ page.previous.title }} and next post: {{ page.next.title }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "next post: Some like it hot" in "_site/2009/03/27/star-wars.html"
    And I should see "Previous post: Some like it hot" in "_site/2009/05/27/terminator.html"
--- a/features/post_excerpts.feature
+++ b/features/post_excerpts.feature
@@ -9,9 +9,9 @@ Feature: Post excerpts
    Given I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
    And I have a _posts directory
    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | entry1    | 2007-12-31 | post    | content for entry1.                    |
-    When I run jekyll
+      | title  | date       | layout | content             |
+      | entry1 | 2007-12-31 | post   | content for entry1. |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see exactly "<p>content for entry1.</p>" in "_site/index.html"

@@ -21,9 +21,9 @@ Feature: Post excerpts
    And I have a _layouts directory
    And I have a post layout that contains "{{ page.excerpt }}"
    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | entry1    | 2007-12-31 | post    | content for entry1.                    |
-    When I run jekyll
+      | title  | date       | layout | content             |
+      | entry1 | 2007-12-31 | post   | content for entry1. |
+    When I run jekyll build
    Then the _site directory should exist
    And the _site/2007 directory should exist
    And the _site/2007/12 directory should exist
@@ -38,9 +38,9 @@ Feature: Post excerpts
    And I have a _layouts directory
    And I have a post layout that contains "<html><head></head><body>{{ page.excerpt }}</body></html>"
    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | entry1    | 2007-12-31 | post    | content for entry1.                    |
-    When I run jekyll
+      | title  | date       | layout | content             |
+      | entry1 | 2007-12-31 | post   | content for entry1. |
+    When I run jekyll build
    Then the _site directory should exist
    And the _site/2007 directory should exist
    And the _site/2007/12 directory should exist
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -7,14 +7,14 @@ Feature: Site configuration
    Given I have a blank site in "_sourcedir"
    And I have an "_sourcedir/index.html" file that contains "Changing source directory"
    And I have a configuration file with "source" set to "_sourcedir"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Changing source directory" in "_site/index.html"

  Scenario: Change destination directory
    Given I have an "index.html" file that contains "Changing destination directory"
    And I have a configuration file with "destination" set to "_mysite"
-    When I run jekyll
+    When I run jekyll build
    Then the _mysite directory should exist
    And I should see "Changing destination directory" in "_mysite/index.html"

@@ -25,7 +25,7 @@ Feature: Site configuration
    | key         | value    |
    | source      | <source> |
    | destination | <dest>   |
-    When I run jekyll
+    When I run jekyll build
    Then the <source> directory should exist
    And the "<dest>/index.html" file should <file_exist> exist
    And I should see "markdown" in "<source>/index.md"
@@ -44,7 +44,7 @@ Feature: Site configuration
    And I have an "README" file that contains "I want to be excluded"
    And I have an "index.html" file that contains "I want to be included"
    And I have a configuration file with "exclude" set to "['Rakefile', 'README']"
-    When I run jekyll
+    When I run jekyll build
    Then I should see "I want to be included" in "_site/index.html"
    And the "_site/Rakefile" file should not exist
    And the "_site/README" file should not exist
@@ -57,7 +57,7 @@ Feature: Site configuration
      | value    |
      | README   |
      | Rakefile |
-    When I run jekyll
+    When I run jekyll build
    Then I should see "I want to be included" in "_site/index.html"
    And the "_site/Rakefile" file should not exist
    And the "_site/README" file should not exist
@@ -65,37 +65,54 @@ Feature: Site configuration
  Scenario: Use RDiscount for markup
    Given I have an "index.markdown" page that contains "[Google](http://google.com)"
    And I have a configuration file with "markdown" set to "rdiscount"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"

  Scenario: Use Kramdown for markup
    Given I have an "index.markdown" page that contains "[Google](http://google.com)"
    And I have a configuration file with "markdown" set to "kramdown"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"

  Scenario: Use Redcarpet for markup
    Given I have an "index.markdown" page that contains "[Google](http://google.com)"
    And I have a configuration file with "markdown" set to "redcarpet"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"

  Scenario: Use Maruku for markup
    Given I have an "index.markdown" page that contains "[Google](http://google.com)"
    And I have a configuration file with "markdown" set to "maruku"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"

  Scenario: Highlight code with pygments
-    Given I have an "index.html" file that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
-    And I have a configuration file with "pygments" set to "true"
-    When I run jekyll
+    Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
+    When I run jekyll build
    Then the _site directory should exist
-    And I should see "puts 'Hello world!'" in "_site/index.html"
+    And I should see "Hello world!" in "_site/index.html"
+    And I should see "class=\"highlight\"" in "_site/index.html"
+
+  Scenario: Highlight code with rouge
+    Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
+    And I have a configuration file with "highlighter" set to "rouge"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Hello world!" in "_site/index.html"
+    And I should see "class=\"highlight\"" in "_site/index.html"
+
+  Scenario: Rouge renders code block once
+    Given I have a configuration file with "highlighter" set to "rouge"
+    And I have a _posts directory
+    And I have the following post:
+      | title | date             | layout  | content                                      |
+      | foo   | 2014-04-27 11:34 | default | {% highlight text %} test {% endhighlight %} |
+    When I run jekyll build
+    Then I should not see "highlight(.*)highlight" in "_site/2014/04/27/foo.html"

  Scenario: Set time and no future dated posts
    Given I have a _layouts directory
@@ -108,10 +125,10 @@ Feature: Site configuration
      | future      | false        |
    And I have a _posts directory
    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | entry1    | 2007-12-31 | post    | content for entry1.                    |
-      | entry2    | 2020-01-31 | post    | content for entry2.                    |
-    When I run jekyll
+      | title  | date       | layout | content             |
+      | entry1 | 2007-12-31 | post   | content for entry1. |
+      | entry2 | 2020-01-31 | post   | content for entry2. |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Page Layout: 1 on 2010-01-01" in "_site/index.html"
    And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
@@ -128,10 +145,10 @@ Feature: Site configuration
      | future      | true         |
    And I have a _posts directory
    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | entry1    | 2007-12-31 | post    | content for entry1.                    |
-      | entry2    | 2020-01-31 | post    | content for entry2.                    |
-    When I run jekyll
+      | title  | date       | layout | content             |
+      | entry1 | 2007-12-31 | post   | content for entry1. |
+      | entry2 | 2020-01-31 | post   | content for entry2. |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html"
    And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
@@ -150,7 +167,7 @@ Feature: Site configuration
        | title     | date                   | layout  | content             |
        | entry1    | 2013-04-09 23:22 -0400 | post    | content for entry1. |
        | entry2    | 2013-04-10 03:14 -0400 | post    | content for entry2. |
-      When I run jekyll
+      When I run jekyll build
      Then the _site directory should exist
      And I should see "Page Layout: 2" in "_site/index.html"
      And I should see "Post Layout: <p>content for entry1.</p> built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html"
@@ -169,7 +186,7 @@ Feature: Site configuration
        | title     | date                   | layout  | content             |
        | entry1    | 2013-04-09 23:22 -0400 | post    | content for entry1. |
        | entry2    | 2013-04-10 03:14 -0400 | post    | content for entry2. |
-      When I run jekyll
+      When I run jekyll build
      Then the _site directory should exist
      And I should see "Page Layout: 2" in "_site/index.html"
      And the "_site/2013/04/10/entry1.html" file should exist
@@ -183,11 +200,11 @@ Feature: Site configuration
      | key         | value       |
      | limit_posts | 2           |
    And I have the following posts:
-      | title   | date      | content          |
-      | Apples  | 2009-03-27 | An article about apples |
-      | Oranges | 2009-04-01  | An article about oranges |
-      | Bananas | 2009-04-05  | An article about bananas |
-    When I run jekyll
+      | title   | date       | content                  |
+      | Apples  | 2009-03-27 | An article about apples  |
+      | Oranges | 2009-04-01 | An article about oranges |
+      | Bananas | 2009-04-05 | An article about bananas |
+    When I run jekyll build
    Then the _site directory should exist
    And the "_site/2009/04/05/bananas.html" file should exist
    And the "_site/2009/04/01/oranges.html" file should exist
@@ -200,7 +217,7 @@ Feature: Site configuration
      | value      |
      | .gitignore |
      | .foo       |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see ".DS_Store" in "_site/.gitignore"
    And the "_site/.htaccess" file should not exist
@@ -217,10 +234,10 @@ Feature: Site configuration
      | layouts     | _theme       |
    And I have a _posts directory
    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | entry1    | 2007-12-31 | post    | content for entry1.                    |
-      | entry2    | 2020-01-31 | post    | content for entry2.                    |
-    When I run jekyll
+      | title  | date       | layout | content             |
+      | entry1 | 2007-12-31 | post   | content for entry1. |
+      | entry2 | 2020-01-31 | post   | content for entry2. |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html"
    And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
@@ -229,7 +246,30 @@ Feature: Site configuration
  Scenario: Add a gem-based plugin
    Given I have an "index.html" file that contains "Whatever"
    And I have a configuration file with "gems" set to "[jekyll_test_plugin]"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Whatever" in "_site/index.html"
    And I should see "this is a test" in "_site/test.txt"
+
+  Scenario: Add an empty whitelist to restrict all gems
+    Given I have an "index.html" file that contains "Whatever"
+    And I have a configuration file with:
+      | key       | value                |
+      | gems      | [jekyll_test_plugin] |
+      | whitelist | []                   |
+    When I run jekyll build --safe
+    Then the _site directory should exist
+    And I should see "Whatever" in "_site/index.html"
+    And the "_site/test.txt" file should not exist
+
+  Scenario: Add a whitelist to restrict some gems but allow others
+    Given I have an "index.html" file that contains "Whatever"
+    And I have a configuration file with:
+      | key       | value                                              |
+      | gems      | [jekyll_test_plugin, jekyll_test_plugin_malicious] |
+      | whitelist | [jekyll_test_plugin]                               |
+    When I run jekyll build --safe
+    Then the _site directory should exist
+    And I should see "Whatever" in "_site/index.html"
+    And the "_site/test.txt" file should exist
+    And I should see "this is a test" in "_site/test.txt"
--- a/features/site_data.feature
+++ b/features/site_data.feature
@@ -5,32 +5,32 @@ Feature: Site data

  Scenario: Use page variable in a page
    Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@example.com"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Contact: email@example.com" in "_site/contact.html"

  Scenario Outline: Use page.path variable in a page
    Given I have a <dir> directory
    And I have a "<path>" page that contains "Source path: {{ page.path }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Source path: <path>" in "_site/<path>"

    Examples:
-      | dir | path |
-      | .   | index.html |
-      | dir | dir/about.html |
+      | dir        | path                 |
+      | .          | index.html           |
+      | dir        | dir/about.html       |
      | dir/nested | dir/nested/page.html |

  Scenario: Override page.path
    Given I have an "override.html" page with path "custom-override.html" that contains "Custom path: {{ page.path }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Custom path: custom-override.html" in "_site/override.html"

  Scenario: Use site.time variable
    Given I have an "index.html" page that contains "{{ site.time }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see today's time in "_site/index.html"

@@ -38,11 +38,11 @@ Feature: Site data
    Given I have a _posts directory
    And I have an "index.html" page that contains "{{ site.posts.first.title }}: {{ site.posts.first.url }}"
    And I have the following posts:
-      | title       | date      | content         |
-      | First Post  | 2009-03-25 | My First Post   |
-      | Second Post | 2009-03-26 | My Second Post  |
-      | Third Post  | 2009-03-27 | My Third Post   |
-    When I run jekyll
+      | title       | date       | content        |
+      | First Post  | 2009-03-25 | My First Post  |
+      | Second Post | 2009-03-26 | My Second Post |
+      | Third Post  | 2009-03-27 | My Third Post  |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Third Post: /2009/03/27/third-post.html" in "_site/index.html"

@@ -50,11 +50,11 @@ Feature: Site data
    Given I have a _posts directory
    And I have an "index.html" page that contains "{% for post in site.posts %} {{ post.title }} {% endfor %}"
    And I have the following posts:
-      | title       | date      | content         |
-      | First Post  | 2009-03-25 | My First Post   |
-      | Second Post | 2009-03-26 | My Second Post  |
-      | Third Post  | 2009-03-27 | My Third Post   |
-    When I run jekyll
+      | title       | date       | content        |
+      | First Post  | 2009-03-25 | My First Post  |
+      | Second Post | 2009-03-26 | My Second Post |
+      | Third Post  | 2009-03-27 | My Third Post  |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Third Post  Second Post  First Post" in "_site/index.html"

@@ -62,10 +62,10 @@ Feature: Site data
    Given I have a _posts directory
    And I have an "index.html" page that contains "{% for post in site.categories.code %} {{ post.title }} {% endfor %}"
    And I have the following posts:
-      | title          | date      | category | content            |
+      | title          | date       | category | content            |
      | Awesome Hack   | 2009-03-26 | code     | puts 'Hello World' |
      | Delicious Beer | 2009-03-26 | food     | 1) Yuengling       |
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Awesome Hack" in "_site/index.html"

@@ -73,9 +73,9 @@ Feature: Site data
    Given I have a _posts directory
    And I have an "index.html" page that contains "{% for post in site.tags.beer %} {{ post.content }} {% endfor %}"
    And I have the following posts:
-      | title          | date      | tag  | content            |
-      | Delicious Beer | 2009-03-26 | beer | 1) Yuengling       |
-    When I run jekyll
+      | title          | date       | tag  | content      |
+      | Delicious Beer | 2009-03-26 | beer | 1) Yuengling |
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "Yuengling" in "_site/index.html"

@@ -83,25 +83,25 @@ Feature: Site data
  Given I have a _posts directory
  And I have an "index.html" page that contains "{% for post in site.posts %}{{ post.title }}:{{ post.previous.title}},{{ post.next.title}} {% endfor %}"
  And I have the following posts:
-    | title | date      | content |
+    | title | date       | content |
    | first | 2009-02-26 | first   |
    | A     | 2009-03-26 | A       |
    | B     | 2009-03-26 | B       |
    | C     | 2009-03-26 | C       |
    | last  | 2009-04-26 | last    |
-  When I run jekyll
+  When I run jekyll build
  Then the _site directory should exist
  And I should see "last:C, C:B,last B:A,C A:first,B first:,A" in "_site/index.html"

  Scenario: Use configuration date in site payload
    Given I have an "index.html" page that contains "{{ site.url }}"
    And I have a configuration file with "url" set to "http://example.com"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "http://example.com" in "_site/index.html"

  Scenario: Access Jekyll version via jekyll.version
    Given I have an "index.html" page that contains "{{ jekyll.version }}"
-    When I run jekyll
+    When I run jekyll build
    Then the _site directory should exist
    And I should see "\d+\.\d+\.\d+" in "_site/index.html"
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -1,13 +1,35 @@
+def file_content_from_hash(input_hash)
+  matter_hash = input_hash.reject { |k, v| k == "content" }
+  matter = matter_hash.map { |k, v| "#{k}: #{v}\n" }.join.chomp
+
+  content = if input_hash['input'] && input_hash['filter']
+    "{{ #{input_hash['input']} | #{input_hash['filter']} }}"
+  else
+    input_hash['content']
+  end
+
+  <<EOF
+---
+#{matter}
+---
+#{content}
+EOF
+end
+
 Before do
-  FileUtils.rm_rf(TEST_DIR)
-  FileUtils.mkdir(TEST_DIR)
+  FileUtils.mkdir_p(TEST_DIR) unless File.exist?(TEST_DIR)
  Dir.chdir(TEST_DIR)
 end

+After do
+  FileUtils.rm_rf(TEST_DIR)   if File.exists?(TEST_DIR)
+  FileUtils.rm(JEKYLL_COMMAND_OUTPUT_FILE) if File.exists?(JEKYLL_COMMAND_OUTPUT_FILE)
+end
+
 World(Test::Unit::Assertions)

 Given /^I have a blank site in "(.*)"$/ do |path|
-  FileUtils.mkdir_p(path)
+  FileUtils.mkdir_p(path) unless File.exist?(path)
 end

 Given /^I do not have a "(.*)" directory$/ do |path|
@@ -58,42 +80,28 @@ Given /^I have an? (.*) directory$/ do |dir|
  FileUtils.mkdir_p(dir)
 end

-Given /^I have the following (draft|post)s?(?: (in|under) "([^"]+)")?:$/ do |status, direction, folder, table|
-  table.hashes.each do |post|
-    title = slug(post['title'])
-    ext = post['type'] || 'textile'
+Given /^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$/ do |status, direction, folder, table|
+  table.hashes.each do |input_hash|
+    title = slug(input_hash['title'])
+    ext = input_hash['type'] || 'textile'
    before, after = location(folder, direction)

-    if "draft" == status
-      folder_post = '_drafts'
+    case status
+    when "draft"
+      dest_folder = '_drafts'
      filename = "#{title}.#{ext}"
-    elsif "post" == status
-      parsed_date = Time.xmlschema(post['date']) rescue Time.parse(post['date'])
-      folder_post = '_posts'
+    when "page"
+      dest_folder = ''
+      filename = "#{title}.#{ext}"
+    when "post"
+      parsed_date = Time.xmlschema(input_hash['date']) rescue Time.parse(input_hash['date'])
+      dest_folder = '_posts'
      filename = "#{parsed_date.strftime('%Y-%m-%d')}-#{title}.#{ext}"
    end

-    path = File.join(before, folder_post, after, filename)
-
-    matter_hash = {}
-    %w(title layout tag tags category categories published author path date permalink).each do |key|
-      matter_hash[key] = post[key] if post[key]
-    end
-    matter = matter_hash.map { |k, v| "#{k}: #{v}\n" }.join.chomp
-
-    content = if post['input'] && post['filter']
-      "{{ #{post['input']} | #{post['filter']} }}"
-    else
-      post['content']
-    end
-
+    path = File.join(before, dest_folder, after, filename)
    File.open(path, 'w') do |f|
-      f.write <<EOF
---
-#{matter}
---
-#{content}
-EOF
+      f.write file_content_from_hash(input_hash)
    end
  end
 end
@@ -121,21 +129,21 @@ Given /^I have a configuration file with "([^\"]*)" set to:$/ do |key, table|
  end
 end

-
-When /^I run jekyll$/ do
-  run_jekyll
+Given /^I have fixture collections$/ do
+  FileUtils.cp_r File.join(JEKYLL_SOURCE_DIR, "test", "source", "_methods"), source_dir
 end

-When /^I run jekyll with drafts$/ do
-  run_jekyll(:drafts => true)
-end
+##################
+#
+# Changing stuff
+#
+##################

-When /^I call jekyll new with test_blank --blank$/ do
-  call_jekyll_new(:path => "test_blank", :blank => true)
-end
-
-When /^I debug jekyll$/ do
-  run_jekyll(:debug => true)
+When /^I run jekyll(.*)$/ do |args|
+  status = run_jekyll(args)
+  if !status || args.include?("--verbose")
+    puts jekyll_run_output
+  end
 end

 When /^I change "(.*)" to contain "(.*)"$/ do |file, text|
@@ -157,7 +165,7 @@ Then /^the (.*) directory should not exist$/ do |dir|
 end

 Then /^I should see "(.*)" in "(.*)"$/ do |text, file|
-  assert_match Regexp.new(text), file_contents(file)
+  assert_match Regexp.new(text, Regexp::MULTILINE), file_contents(file)
 end

 Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file|
@@ -165,7 +173,7 @@ Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file|
 end

 Then /^I should not see "(.*)" in "(.*)"$/ do |text, file|
-  assert_no_match Regexp.new(text), file_contents(file)
+  assert_no_match Regexp.new(text, Regexp::MULTILINE), file_contents(file)
 end

 Then /^I should see escaped "(.*)" in "(.*)"$/ do |text, file|
@@ -177,7 +185,7 @@ Then /^the "(.*)" file should +exist$/ do |file|
 end

 Then /^the "(.*)" file should not exist$/ do |file|
-  assert !File.exists?(file), "The file \"#{file}\" exists"
+  assert !File.exist?(file), "The file \"#{file}\" exists"
 end

 Then /^I should see today's time in "(.*)"$/ do |file|
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,35 +1,38 @@
-if RUBY_VERSION > '1.9'
-  require 'coveralls'
-  Coveralls.wear_merged!
-end
+require 'coveralls'
+Coveralls.wear_merged!

 require 'fileutils'
 require 'rr'
 require 'test/unit'
 require 'time'

-TEST_DIR    = File.join('/', 'tmp', 'jekyll')
+JEKYLL_SOURCE_DIR = File.dirname(File.dirname(File.dirname(__FILE__)))
+TEST_DIR    = File.expand_path(File.join('..', '..', 'tmp', 'jekyll'), File.dirname(__FILE__))
 JEKYLL_PATH = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll')
+JEKYLL_COMMAND_OUTPUT_FILE = File.join(File.dirname(TEST_DIR), 'jekyll_output.txt')

-def run_jekyll(opts = {})
-  command = JEKYLL_PATH.clone
-  command << " build"
-  command << " --drafts" if opts[:drafts]
-  command << " >> /dev/null 2>&1" if opts[:debug].nil?
-  system command
+def source_dir(*files)
+  File.join(TEST_DIR, *files)
 end

-def call_jekyll_new(opts = {})
-  command = JEKYLL_PATH.clone
-  command << " new"
-  command << " #{opts[:path]}" if opts[:path]
-  command << " --blank" if opts[:blank]
-  command << " >> /dev/null 2>&1" if opts[:debug].nil?
-  system command
+def jekyll_output_file
+  JEKYLL_COMMAND_OUTPUT_FILE
+end
+
+def jekyll_run_output
+  File.read(jekyll_output_file)
+end
+
+def run_jekyll(args)
+  system "#{JEKYLL_PATH} #{args} --trace > #{jekyll_output_file} 2>&1"
 end

 def slug(title)
-  title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+  if title
+    title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+  else
+    Time.now.strftime("%s%9N") # nanoseconds since the Epoch
+  end
 end

 def location(folder, direction)
@@ -47,15 +50,8 @@ def file_contents(path)
 end

 def seconds_agnostic_datetime(datetime = Time.now)
-  pieces = datetime.to_s.split(" ")
-  if pieces.size == 6 # Ruby 1.8.7
-    date = pieces[0..2].join(" ")
-    time = seconds_agnostic_time(pieces[3])
-    zone = pieces[4..5].join(" ")
-  else # Ruby 1.9.1 or greater
-    date, time, zone = pieces
-    time = seconds_agnostic_time(time)
-  end
+  date, time, zone = datetime.to_s.split(" ")
+  time = seconds_agnostic_time(time)
  [
    Regexp.escape(date),
    "#{time}:\\d{2}",
@@ -70,6 +66,3 @@ def seconds_agnostic_time(time)
  hour, minutes, _ = time.split(":")
  "#{hour}:#{minutes}"
 end
-
-# work around "invalid option: --format" cucumber bug (see #296)
-Test::Unit.run = true if RUBY_VERSION < '1.9'
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -1,47 +1,54 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'jekyll/version'
+
 Gem::Specification.new do |s|
  s.specification_version = 2 if s.respond_to? :specification_version=
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
+  s.rubygems_version = '2.2.2'
+  s.required_ruby_version = '>= 1.9.3'

  s.name              = 'jekyll'
-  s.version           = '1.4.0'
+  s.version           = Jekyll::VERSION
  s.license           = 'MIT'
-  s.date              = '2013-12-07'
-  s.rubyforge_project = 'jekyll'

  s.summary     = "A simple, blog aware, static site generator."
  s.description = "Jekyll is a simple, blog aware, static site generator."

  s.authors  = ["Tom Preston-Werner"]
  s.email    = 'tom@mojombo.com'
-  s.homepage = 'http://github.com/mojombo/jekyll'
+  s.homepage = 'http://github.com/jekyll/jekyll'

-  s.require_paths = %w[lib]
-
-  s.executables = ["jekyll"]
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]

  s.rdoc_options = ["--charset=UTF-8"]
  s.extra_rdoc_files = %w[README.markdown LICENSE]

-  s.add_runtime_dependency('liquid', "~> 2.5.2")
+  s.add_runtime_dependency('liquid', "~> 2.5.5")
  s.add_runtime_dependency('classifier', "~> 1.3")
-  s.add_runtime_dependency('listen', "~> 1.3")
-  s.add_runtime_dependency('maruku', "~> 0.7.0")
+  s.add_runtime_dependency('listen', "~> 2.5")
+  s.add_runtime_dependency('kramdown', "~> 1.3")
  s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
-  s.add_runtime_dependency('commander', "~> 4.1.3")
-  s.add_runtime_dependency('safe_yaml', "~> 0.9.7")
+  s.add_runtime_dependency('mercenary', "~> 0.3.1")
+  s.add_runtime_dependency('safe_yaml', "~> 1.0")
  s.add_runtime_dependency('colorator', "~> 0.1")
-  s.add_runtime_dependency('redcarpet', "~> 2.3.0")
+  s.add_runtime_dependency('redcarpet', "~> 3.1")
  s.add_runtime_dependency('toml', '~> 0.1.0')
+  s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
+  s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')

  s.add_development_dependency('rake', "~> 10.1")
  s.add_development_dependency('rdoc', "~> 3.11")
  s.add_development_dependency('redgreen', "~> 1.2")
-  s.add_development_dependency('shoulda', "~> 3.3.2")
+  s.add_development_dependency('shoulda', "~> 3.5")
  s.add_development_dependency('rr', "~> 1.1")
-  s.add_development_dependency('cucumber', "~> 1.3")
+  s.add_development_dependency('cucumber', "1.3.11")
  s.add_development_dependency('RedCloth', "~> 4.2")
-  s.add_development_dependency('kramdown', "~> 1.2")
+  s.add_development_dependency('maruku', "0.7.0")
  s.add_development_dependency('rdiscount', "~> 1.6")
  s.add_development_dependency('launchy', "~> 2.3")
  s.add_development_dependency('simplecov', "~> 0.7")
@@ -50,252 +57,6 @@ Gem::Specification.new do |s|
  s.add_development_dependency('mime-types', "~> 1.5")
  s.add_development_dependency('activesupport', '~> 3.2.13')
  s.add_development_dependency('jekyll_test_plugin')
-
-  # = MANIFEST =
-  s.files = %w[
-    CONTRIBUTING.markdown
-    Gemfile
-    History.markdown
-    LICENSE
-    README.markdown
-    Rakefile
-    bin/jekyll
-    cucumber.yml
-    features/create_sites.feature
-    features/data.feature
-    features/drafts.feature
-    features/embed_filters.feature
-    features/include_tag.feature
-    features/markdown.feature
-    features/pagination.feature
-    features/permalinks.feature
-    features/post_data.feature
-    features/post_excerpts.feature
-    features/site_configuration.feature
-    features/site_data.feature
-    features/step_definitions/jekyll_steps.rb
-    features/support/env.rb
-    jekyll.gemspec
-    lib/jekyll.rb
-    lib/jekyll/cleaner.rb
-    lib/jekyll/command.rb
-    lib/jekyll/commands/build.rb
-    lib/jekyll/commands/doctor.rb
-    lib/jekyll/commands/new.rb
-    lib/jekyll/commands/serve.rb
-    lib/jekyll/configuration.rb
-    lib/jekyll/converter.rb
-    lib/jekyll/converters/identity.rb
-    lib/jekyll/converters/markdown.rb
-    lib/jekyll/converters/markdown/kramdown_parser.rb
-    lib/jekyll/converters/markdown/maruku_parser.rb
-    lib/jekyll/converters/markdown/rdiscount_parser.rb
-    lib/jekyll/converters/markdown/redcarpet_parser.rb
-    lib/jekyll/converters/textile.rb
-    lib/jekyll/convertible.rb
-    lib/jekyll/core_ext.rb
-    lib/jekyll/deprecator.rb
-    lib/jekyll/draft.rb
-    lib/jekyll/entry_filter.rb
-    lib/jekyll/errors.rb
-    lib/jekyll/excerpt.rb
-    lib/jekyll/filters.rb
-    lib/jekyll/generator.rb
-    lib/jekyll/generators/pagination.rb
-    lib/jekyll/layout.rb
-    lib/jekyll/mime.types
-    lib/jekyll/page.rb
-    lib/jekyll/plugin.rb
-    lib/jekyll/post.rb
-    lib/jekyll/related_posts.rb
-    lib/jekyll/site.rb
-    lib/jekyll/static_file.rb
-    lib/jekyll/stevenson.rb
-    lib/jekyll/tags/gist.rb
-    lib/jekyll/tags/highlight.rb
-    lib/jekyll/tags/include.rb
-    lib/jekyll/tags/post_url.rb
-    lib/jekyll/url.rb
-    lib/site_template/.gitignore
-    lib/site_template/_config.yml
-    lib/site_template/_layouts/default.html
-    lib/site_template/_layouts/post.html
-    lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
-    lib/site_template/css/main.css
-    lib/site_template/css/syntax.css
-    lib/site_template/index.html
-    script/bootstrap
-    site/.gitignore
-    site/CNAME
-    site/README
-    site/_config.yml
-    site/_includes/analytics.html
-    site/_includes/docs_contents.html
-    site/_includes/docs_contents_mobile.html
-    site/_includes/docs_option.html
-    site/_includes/docs_ul.html
-    site/_includes/footer.html
-    site/_includes/header.html
-    site/_includes/news_contents.html
-    site/_includes/news_contents_mobile.html
-    site/_includes/news_item.html
-    site/_includes/primary-nav-items.html
-    site/_includes/section_nav.html
-    site/_includes/top.html
-    site/_layouts/default.html
-    site/_layouts/docs.html
-    site/_layouts/news.html
-    site/_layouts/news_item.html
-    site/_posts/2013-05-06-jekyll-1-0-0-released.markdown
-    site/_posts/2013-05-08-jekyll-1-0-1-released.markdown
-    site/_posts/2013-05-12-jekyll-1-0-2-released.markdown
-    site/_posts/2013-06-07-jekyll-1-0-3-released.markdown
-    site/_posts/2013-07-14-jekyll-1-1-0-released.markdown
-    site/_posts/2013-07-24-jekyll-1-1-1-released.markdown
-    site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
-    site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
-    site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
-    site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
-    site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
-    site/_posts/2013-11-04-jekyll-1-3-0-released.markdown
-    site/_posts/2013-11-26-jekyll-1-3-1-released.markdown
-    site/_posts/2013-12-07-jekyll-1-4-0-released.markdown
-    site/css/gridism.css
-    site/css/normalize.css
-    site/css/pygments.css
-    site/css/style.css
-    site/docs/configuration.md
-    site/docs/contributing.md
-    site/docs/datafiles.md
-    site/docs/deployment-methods.md
-    site/docs/drafts.md
-    site/docs/extras.md
-    site/docs/frontmatter.md
-    site/docs/github-pages.md
-    site/docs/heroku.md
-    site/docs/history.md
-    site/docs/index.md
-    site/docs/installation.md
-    site/docs/migrations.md
-    site/docs/pages.md
-    site/docs/pagination.md
-    site/docs/permalinks.md
-    site/docs/plugins.md
-    site/docs/posts.md
-    site/docs/quickstart.md
-    site/docs/resources.md
-    site/docs/sites.md
-    site/docs/structure.md
-    site/docs/templates.md
-    site/docs/troubleshooting.md
-    site/docs/upgrading.md
-    site/docs/usage.md
-    site/docs/variables.md
-    site/favicon.png
-    site/feed.xml
-    site/freenode.txt
-    site/img/article-footer.png
-    site/img/footer-arrow.png
-    site/img/footer-logo.png
-    site/img/logo-2x.png
-    site/img/octojekyll.png
-    site/img/tube.png
-    site/img/tube1x.png
-    site/index.html
-    site/js/modernizr-2.5.3.min.js
-    site/news/index.html
-    site/news/releases/index.html
-    test/fixtures/broken_front_matter1.erb
-    test/fixtures/broken_front_matter2.erb
-    test/fixtures/broken_front_matter3.erb
-    test/fixtures/exploit_front_matter.erb
-    test/fixtures/front_matter.erb
-    test/helper.rb
-    test/source/+/foo.md
-    test/source/.htaccess
-    test/source/_config.dev.toml
-    test/source/_data/languages.yml
-    test/source/_data/members.yaml
-    test/source/_data/products.yml
-    test/source/_includes/params.html
-    test/source/_includes/sig.markdown
-    test/source/_layouts/default.html
-    test/source/_layouts/post/simple.html
-    test/source/_layouts/simple.html
-    test/source/_plugins/dummy.rb
-    test/source/_posts/2008-02-02-not-published.textile
-    test/source/_posts/2008-02-02-published.textile
-    test/source/_posts/2008-10-18-foo-bar.textile
-    test/source/_posts/2008-11-21-complex.textile
-    test/source/_posts/2008-12-03-permalinked-post.textile
-    test/source/_posts/2008-12-13-include.markdown
-    test/source/_posts/2009-01-27-array-categories.textile
-    test/source/_posts/2009-01-27-categories.textile
-    test/source/_posts/2009-01-27-category.textile
-    test/source/_posts/2009-01-27-empty-categories.textile
-    test/source/_posts/2009-01-27-empty-category.textile
-    test/source/_posts/2009-03-12-hash-#1.markdown
-    test/source/_posts/2009-05-18-empty-tag.textile
-    test/source/_posts/2009-05-18-empty-tags.textile
-    test/source/_posts/2009-05-18-tag.textile
-    test/source/_posts/2009-05-18-tags.textile
-    test/source/_posts/2009-06-22-empty-yaml.textile
-    test/source/_posts/2009-06-22-no-yaml.textile
-    test/source/_posts/2010-01-08-triple-dash.markdown
-    test/source/_posts/2010-01-09-date-override.textile
-    test/source/_posts/2010-01-09-time-override.textile
-    test/source/_posts/2010-01-09-timezone-override.textile
-    test/source/_posts/2010-01-16-override-data.textile
-    test/source/_posts/2011-04-12-md-extension.md
-    test/source/_posts/2011-04-12-text-extension.text
-    test/source/_posts/2013-01-02-post-excerpt.markdown
-    test/source/_posts/2013-01-12-nil-layout.textile
-    test/source/_posts/2013-01-12-no-layout.textile
-    test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
-    test/source/_posts/2013-04-11-custom-excerpt.markdown
-    test/source/_posts/2013-05-10-number-category.textile
-    test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
-    test/source/_posts/2013-08-01-mkdn-extension.mkdn
-    test/source/_posts/es/2008-11-21-nested.textile
-    test/source/about.html
-    test/source/category/_posts/2008-9-23-categories.textile
-    test/source/contacts.html
-    test/source/contacts/bar.html
-    test/source/contacts/index.html
-    test/source/css/screen.css
-    test/source/deal.with.dots.html
-    test/source/foo/_posts/bar/2008-12-12-topical-post.textile
-    test/source/index.html
-    test/source/products.yml
-    test/source/sitemap.xml
-    test/source/symlink-test/_data
-    test/source/symlink-test/symlinked-dir
-    test/source/symlink-test/symlinked-file
-    test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
-    test/source/z_category/_posts/2008-9-23-categories.textile
-    test/suite.rb
-    test/test_command.rb
-    test/test_configuration.rb
-    test/test_convertible.rb
-    test/test_core_ext.rb
-    test/test_entry_filter.rb
-    test/test_excerpt.rb
-    test/test_filters.rb
-    test/test_generated_site.rb
-    test/test_kramdown.rb
-    test/test_new_command.rb
-    test/test_page.rb
-    test/test_pager.rb
-    test/test_post.rb
-    test/test_rdiscount.rb
-    test/test_redcarpet.rb
-    test/test_redcloth.rb
-    test/test_related_posts.rb
-    test/test_site.rb
-    test/test_tags.rb
-    test/test_url.rb
-  ]
-  # = MANIFEST =
-
-  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
+  s.add_development_dependency('jekyll_test_plugin_malicious')
+  s.add_development_dependency('rouge', '~> 1.3')
 end
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -18,7 +18,7 @@ require 'rubygems'
 # stdlib
 require 'fileutils'
 require 'time'
-require 'safe_yaml'
+require 'safe_yaml/load'
 require 'English'
 require 'pathname'

@@ -29,10 +29,15 @@ require 'colorator'
 require 'toml'

 # internal requires
-require 'jekyll/core_ext'
+require 'jekyll/version'
+require 'jekyll/utils'
 require 'jekyll/stevenson'
 require 'jekyll/deprecator'
 require 'jekyll/configuration'
+require 'jekyll/document'
+require 'jekyll/collection'
+require 'jekyll/plugin_manager'
+require 'jekyll/frontmatter_defaults'
 require 'jekyll/site'
 require 'jekyll/convertible'
 require 'jekyll/url'
@@ -47,12 +52,16 @@ require 'jekyll/errors'
 require 'jekyll/related_posts'
 require 'jekyll/cleaner'
 require 'jekyll/entry_filter'
+require 'jekyll/layout_reader'
+require 'jekyll/publisher'
+require 'jekyll/renderer'

 # extensions
 require 'jekyll/plugin'
 require 'jekyll/converter'
 require 'jekyll/generator'
 require 'jekyll/command'
+require 'jekyll/liquid_extensions'

 require_all 'jekyll/commands'
 require_all 'jekyll/converters'
@@ -60,11 +69,13 @@ require_all 'jekyll/converters/markdown'
 require_all 'jekyll/generators'
 require_all 'jekyll/tags'

+# plugins
+require 'jekyll-coffeescript'
+require 'jekyll-sass-converter'
+
 SafeYAML::OPTIONS[:suppress_warnings] = true

 module Jekyll
-  VERSION = '1.4.0'
-
  # Public: Generate a Jekyll configuration Hash by merging the default
  # options with anything in _config.yml, and adding the given options on top.
  #
@@ -79,7 +90,7 @@ module Jekyll
    config = config.read_config_files(config.config_files(override))

    # Merge DEFAULTS < _config.yml < override
-    config = config.deep_merge(override).stringify_keys
+    config = Utils.deep_merge_hashes(config, override).stringify_keys
    set_timezone(config['timezone']) if config['timezone']

    config
@@ -97,4 +108,21 @@ module Jekyll
  def self.logger
    @logger ||= Stevenson.new
  end
+
+  # Public: File system root
+  #
+  # Returns the root of the filesystem as a Pathname
+  def self.fs_root
+    @fs_root ||= "/"
+  end
+
+  def self.sanitized_path(base_directory, questionable_path)
+    clean_path = File.expand_path(questionable_path, fs_root)
+    clean_path.gsub!(/\A\w\:\//, '/')
+    unless clean_path.start_with?(base_directory)
+      File.join(base_directory, clean_path)
+    else
+      clean_path
+    end
+  end
 end
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -4,6 +4,8 @@ module Jekyll
  class Site
    # Handles the cleanup of a site's destination before it is built.
    class Cleaner
+      attr_reader :site
+
      def initialize(site)
        @site = site
      end
@@ -27,7 +29,7 @@ module Jekyll
      # Returns a Set with the file paths
      def existing_files
        files = Set.new
-        Dir.glob(File.join(@site.dest, "**", "*"), File::FNM_DOTMATCH) do |file|
+        Dir.glob(File.join(site.dest, "**", "*"), File::FNM_DOTMATCH) do |file|
          files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex
        end
        files
@@ -38,7 +40,7 @@ module Jekyll
      # Returns a Set with the file paths
      def new_files
        files = Set.new
-        @site.each_site_file { |item| files << item.destination(@site.dest) }
+        site.each_site_file { |item| files << item.destination(site.dest) }
        files
      end

@@ -64,7 +66,7 @@ module Jekyll
      #
      # Returns the regular expression
      def keep_file_regex
-        or_list = @site.keep_files.join("|")
+        or_list = site.keep_files.join("|")
        pattern = "\/(#{or_list.gsub(".", "\.")})"
        Regexp.new pattern
      end
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -0,0 +1,147 @@
+module Jekyll
+  class Collection
+    attr_reader :site, :label, :metadata
+
+    # Create a new Collection.
+    #
+    # site - the site to which this collection belongs.
+    # label - the name of the collection
+    #
+    # Returns nothing.
+    def initialize(site, label)
+      @site     = site
+      @label    = sanitize_label(label)
+      @metadata = extract_metadata
+    end
+
+    # Fetch the Documents in this collection.
+    # Defaults to an empty array if no documents have been read in.
+    #
+    # Returns an array of Jekyll::Document objects.
+    def docs
+      @docs ||= []
+    end
+
+    # Read the allowed documents into the collection's array of docs.
+    #
+    # Returns the sorted array of docs.
+    def read
+      filtered_entries.each do |file_path|
+        doc = Jekyll::Document.new(Jekyll.sanitized_path(directory, file_path), { site: site, collection: self })
+        doc.read
+        docs << doc
+      end
+      docs.sort!
+    end
+
+    # All the entries in this collection.
+    #
+    # Returns an Array of file paths to the documents in this collection
+    #   relative to the collection's directory
+    def entries
+      return Array.new unless exists?
+      Dir.glob(File.join(directory, "**", "*.*")).map do |entry|
+        entry[File.join(directory, "")] = ''; entry
+      end
+    end
+
+    # Filtered version of the entries in this collection.
+    # See `Jekyll::EntryFilter#filter` for more information.
+    #
+    # Returns a list of filtered entry paths.
+    def filtered_entries
+      return Array.new unless exists?
+      Dir.chdir(directory) do
+        entry_filter.filter(entries)
+      end
+    end
+
+    # The directory for this Collection, relative to the site source.
+    #
+    # Returns a String containing the directory name where the collection
+    #   is stored on the filesystem.
+    def relative_directory
+      "_#{label}"
+    end
+
+    # The full path to the directory containing the
+    #
+    # Returns a String containing th directory name where the collection
+    #   is stored on the filesystem.
+    def directory
+      Jekyll.sanitized_path(site.source, relative_directory)
+    end
+
+    # Checks whether the directory "exists" for this collection.
+    # The directory must exist on the filesystem and must not be a symlink
+    #   if in safe mode.
+    #
+    # Returns false if the directory doesn't exist or if it's a symlink
+    #   and we're in safe mode.
+    def exists?
+      File.directory?(directory) && !(File.symlink?(directory) && site.safe)
+    end
+
+    # The entry filter for this collection.
+    # Creates an instance of Jekyll::EntryFilter.
+    #
+    # Returns the instance of Jekyll::EntryFilter for this collection.
+    def entry_filter
+      @entry_filter ||= Jekyll::EntryFilter.new(site, relative_directory)
+    end
+
+    # An inspect string.
+    #
+    # Returns the inspect string
+    def inspect
+      "#<Jekyll::Collection @label=#{label} docs=#{docs}>"
+    end
+
+    # Produce a sanitized label name
+    # Label names may not contain anything but alphanumeric characters,
+    #   underscores, and hyphens.
+    #
+    # label - the possibly-unsafe label
+    #
+    # Returns a sanitized version of the label.
+    def sanitize_label(label)
+      label.gsub(/[^a-z0-9_\-]/i, '')
+    end
+
+    # Produce a representation of this Collection for use in Liquid.
+    # Exposes two attributes:
+    #   - label
+    #   - docs
+    #
+    # Returns a representation of this collection for use in Liquid.
+    def to_liquid
+      metadata.merge({
+        "label"     => label,
+        "docs"      => docs,
+        "directory" => directory,
+        "output"    => write?,
+        "relative_directory" => relative_directory
+      })
+    end
+
+    # Whether the collection's documents ought to be written as individual
+    #   files in the output.
+    #
+    # Returns true if the 'write' metadata is true, false otherwise.
+    def write?
+      !!metadata['output']
+    end
+
+    # Extract options for this collection from the site configuration.
+    #
+    # Returns the metadata for this collection
+    def extract_metadata
+      if site.config['collections'].is_a?(Hash)
+        site.config['collections'][label] || Hash.new
+      else
+        {}
+      end
+    end
+
+  end
+end
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -1,27 +1,81 @@
 module Jekyll
  class Command
-    def self.globs(source, destination)
-      Dir.chdir(source) do
-        dirs = Dir['*'].select { |x| File.directory?(x) }
-        dirs -= [destination, File.expand_path(destination), File.basename(destination)]
-        dirs = dirs.map { |x| "#{x}/**/*" }
-        dirs += ['*']
+
+    class << self
+
+      # A list of subclasses of Jekyll::Command
+      def subclasses
+        @subclasses ||= []
      end
+
+      # Keep a list of subclasses of Jekyll::Command every time it's inherited
+      # Called automatically.
+      #
+      # base - the subclass
+      #
+      # Returns nothing
+      def inherited(base)
+        subclasses << base
+        super(base)
+      end
+
+      # Listing of all directories (globbed to include subfiles and folders)
+      #
+      # source - the source path
+      # destination - the destination path
+      #
+      # Returns an Array of directory globs in the source, excluding the destination
+      def globs(source, destination)
+        Dir.chdir(source) do
+          dirs = Dir['*'].select { |x| File.directory?(x) }
+          dirs -= [destination, File.expand_path(destination), File.basename(destination)]
+          dirs = dirs.map { |x| "#{x}/**/*" }
+          dirs += ['*']
+        end
+      end
+
+      # Run Site#process and catch errors
+      #
+      # site - the Jekyll::Site object
+      #
+      # Returns nothing
+      def process_site(site)
+        site.process
+      rescue Jekyll::FatalException => e
+        Jekyll.logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
+        Jekyll.logger.error "", "------------------------------------"
+        Jekyll.logger.error "", e.message
+        exit(1)
+      end
+
+      # Create a full Jekyll configuration with the options passed in as overrides
+      #
+      # options - the configuration overrides
+      #
+      # Returns a full Jekyll configuration
+      def configuration_from_options(options)
+        Jekyll.configuration(options)
+      end
+
+      # Add common options to a command for building configuration
+      #
+      # c - the Jekyll::Command to add these options to
+      #
+      # Returns nothing
+      def add_build_options(c)
+        c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+        c.option 'future',  '--future', 'Publishes posts with a future date'
+        c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
+        c.option 'watch',   '-w', '--watch', 'Watch for changes and rebuild'
+        c.option 'force_polling', '--force_polling', 'Force watch to use polling'
+        c.option 'lsi',     '--lsi', 'Use LSI for improved related posts'
+        c.option 'show_drafts',  '-D', '--drafts', 'Render posts in the _drafts folder'
+        c.option 'unpublished', '--unpublished', 'Render posts that were marked as unpublished'
+        c.option 'quiet',   '-q', '--quiet', 'Silence output.'
+        c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
+      end
+
    end

-    # Static: Run Site#process and catch errors
-    #
-    # site - the Jekyll::Site object
-    #
-    # Returns nothing
-    def self.process_site(site)
-      site.process
-    rescue Jekyll::FatalException => e
-      puts
-      Jekyll.logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
-      Jekyll.logger.error "", "------------------------------------"
-      Jekyll.logger.error "", e.message
-      exit(1)
-    end
  end
 end
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -1,70 +1,100 @@
 module Jekyll
  module Commands
    class Build < Command
-      def self.process(options)
-        site = Jekyll::Site.new(options)

-        self.build(site, options)
-        self.watch(site, options) if options['watch']
-      end
+      class << self

-      # Private: Build the site from source into destination.
-      #
-      # site - A Jekyll::Site instance
-      # options - A Hash of options passed to the command
-      #
-      # Returns nothing.
-      def self.build(site, options)
-        source = options['source']
-        destination = options['destination']
-        Jekyll.logger.info "Source:", source
-        Jekyll.logger.info "Destination:", destination
-        print Jekyll.logger.formatted_topic "Generating..."
-        self.process_site(site)
-        puts "done."
-      end
+        # Create the Mercenary command for the Jekyll CLI for this Command
+        def init_with_program(prog)
+          prog.command(:build) do |c|
+            c.syntax      'build [options]'
+            c.description 'Build your site'

-      # Private: Watch for file changes and rebuild the site.
-      #
-      # site - A Jekyll::Site instance
-      # options - A Hash of options passed to the command
-      #
-      # Returns nothing.
-      def self.watch(site, options)
-        require 'listen'
+            add_build_options(c)

-        source = options['source']
-        destination = options['destination']
-
-        begin
-          dest = Pathname.new(destination).relative_path_from(Pathname.new(source)).to_s
-          ignored = Regexp.new(Regexp.escape(dest))
-        rescue ArgumentError
-          # Destination is outside the source, no need to ignore it.
-          ignored = nil
+            c.action do |args, options|
+              options["serving"] = false
+              Jekyll::Commands::Build.process(options)
+            end
+          end
        end

-        Jekyll.logger.info "Auto-regeneration:", "enabled"
+        # Build your jekyll site
+        # Continuously watch if `watch` is set to true in the config.
+        def process(options)
+          options = configuration_from_options(options)
+          site = Jekyll::Site.new(options)

-        listener = Listen::Listener.new(source, :ignore => ignored) do |modified, added, removed|
-          t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          n = modified.length + added.length + removed.length
-          print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} "
-          self.process_site(site)
-          puts  "...done."
+          Jekyll.logger.log_level = :error if options['quiet']
+
+          build(site, options)
+          watch(site, options) if options['watch']
        end
-        listener.start

-        unless options['serving']
-          trap("INT") do
-            listener.stop
-            puts "     Halting auto-regeneration."
-            exit 0
+        # Build your Jekyll site.
+        #
+        # site - the Jekyll::Site instance to build
+        # options - the
+        #
+        # Returns nothing.
+        def build(site, options)
+          source      = options['source']
+          destination = options['destination']
+          Jekyll.logger.info "Source:", source
+          Jekyll.logger.info "Destination:", destination
+          Jekyll.logger.info "Generating..."
+          process_site(site)
+          Jekyll.logger.info "", "done."
+        end
+
+        # Private: Watch for file changes and rebuild the site.
+        #
+        # site - A Jekyll::Site instance
+        # options - A Hash of options passed to the command
+        #
+        # Returns nothing.
+        def watch(site, options)
+          require 'listen'
+
+          source      = options['source']
+          destination = options['destination']
+
+          begin
+            dest    = Pathname.new(destination).relative_path_from(Pathname.new(source)).to_s
+            ignored = Regexp.new(Regexp.escape(dest))
+          rescue ArgumentError
+            # Destination is outside the source, no need to ignore it.
+            ignored = nil
          end

-          loop { sleep 1000 }
+          Jekyll.logger.info "Auto-regeneration:", "enabled"
+
+          listener = Listen.to(
+            source,
+            :ignore => ignored,
+            :force_polling => options['force_polling']
+          ) do |modified, added, removed|
+            t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+            n = modified.length + added.length + removed.length
+            print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} "
+            process_site(site)
+            puts  "...done."
+          end
+          listener.start
+
+          unless options['serving']
+            trap("INT") do
+              listener.stop
+              puts "     Halting auto-regeneration."
+              exit 0
+            end
+
+            loop { sleep 1000 }
+          end
        end
-      end
+
+      end # end of class << self
+
    end
  end
 end
--- a/lib/jekyll/commands/docs.rb
+++ b/lib/jekyll/commands/docs.rb
@@ -0,0 +1,30 @@
+module Jekyll
+  module Commands
+    class Docs < Command
+
+      class << self
+
+        def init_with_program(prog)
+          prog.command(:docs) do |c|
+            c.syntax 'docs'
+            c.description "Launch local server with docs for Jekyll v#{Jekyll::VERSION}"
+
+            c.option 'port', '-P', '--port [PORT]', 'Port to listen on'
+            c.option 'host', '-H', '--host [HOST]', 'Host to bind to'
+
+            c.action do |args, options|
+              options.merge!({
+                'source'      => File.expand_path("../../../site", File.dirname(__FILE__)),
+                'destination' => File.expand_path("../../../site/_site", File.dirname(__FILE__))
+              })
+              Jekyll::Commands::Build.process(options)
+              Jekyll::Commands::Serve.process(options)
+            end
+          end
+        end
+
+      end
+
+    end
+  end
+end
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -2,8 +2,23 @@ module Jekyll
  module Commands
    class Doctor < Command
      class << self
+
+        def init_with_program(prog)
+          prog.command(:doctor) do |c|
+            c.syntax 'doctor'
+            c.description 'Search site and print specific deprecation warnings'
+            c.alias(:hyde)
+
+            c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+
+            c.action do |args, options|
+              Jekyll::Commands::Doctor.process(options)
+            end
+          end
+        end
+
        def process(options)
-          site = Jekyll::Site.new(options)
+          site = Jekyll::Site.new(configuration_from_options(options))
          site.read

          if healthy?(site)
@@ -26,7 +41,7 @@ module Jekyll
            if page.uses_relative_permalinks
              Jekyll.logger.warn "Deprecation:", "'#{page.path}' uses relative" +
                                  " permalinks which will be deprecated in" +
-                                  " Jekyll v1.2 and beyond."
+                                  " Jekyll v2.0.0 and beyond."
              contains_deprecated_pages = true
            end
          end
@@ -61,7 +76,9 @@ module Jekyll
          end
          urls
        end
+
      end
+
    end
  end
 end
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -3,27 +3,40 @@ require 'erb'
 module Jekyll
  module Commands
    class New < Command
+      def self.init_with_program(prog)
+        prog.command(:new) do |c|
+          c.syntax 'new PATH'
+          c.description 'Creates a new Jekyll site scaffold in PATH'
+
+          c.option 'force', '--force', 'Force creation even if PATH already exists'
+          c.option 'blank', '--blank', 'Creates scaffolding but with empty files'
+
+          c.action do |args, options|
+            Jekyll::Commands::New.process(args, options)
+          end
+        end
+      end
+
      def self.process(args, options = {})
        raise ArgumentError.new('You must specify a path.') if args.empty?

        new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
        FileUtils.mkdir_p new_blog_path
        if preserve_source_location?(new_blog_path, options)
-          Jekyll.logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
-          exit(1)
+          Jekyll.logger.abort_with "Conflict:", "#{new_blog_path} exists and is not empty."
        end

-        if options[:blank]
+        if options["blank"]
          create_blank_site new_blog_path
        else
          create_sample_files new_blog_path

-          File.open(File.expand_path(self.initialized_post_name, new_blog_path), "w") do |f|
-            f.write(self.scaffold_post_content)
+          File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f|
+            f.write(scaffold_post_content)
          end
        end

-        puts "New jekyll site installed in #{new_blog_path}."
+        Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
      end

      def self.create_blank_site(path)
@@ -47,7 +60,7 @@ module Jekyll
      private

      def self.preserve_source_location?(path, options)
-        !options[:force] && !Dir["#{path}/**/*"].empty?
+        !options["force"] && !Dir["#{path}/**/*"].empty?
      end

      def self.create_sample_files(path)
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -2,64 +2,127 @@
 module Jekyll
  module Commands
    class Serve < Command
-      def self.process(options)
-        require 'webrick'
-        include WEBrick

-        destination = options['destination']
+      class << self

-        FileUtils.mkdir_p(destination)
+        def init_with_program(prog)
+          prog.command(:serve) do |c|
+            c.syntax 'serve [options]'
+            c.description 'Serve your site locally'
+            c.alias :server
+
+            add_build_options(c)
+
+            c.option 'detach', '-B', '--detach', 'Run the server in the background (detach)'
+            c.option 'port', '-P', '--port [PORT]', 'Port to listen on'
+            c.option 'host', '-H', '--host [HOST]', 'Host to bind to'
+            c.option 'baseurl', '-b', '--baseurl [URL]', 'Base URL'
+
+            c.action do |args, options|
+              options["serving"] ||= true
+              Jekyll::Commands::Build.process(options)
+              Jekyll::Commands::Serve.process(options)
+            end
+          end
+        end
+
+        # Boot up a WEBrick server which points to the compiled site's root.
+        def process(options)
+          options = configuration_from_options(options)
+          destination = options['destination']
+          setup(destination)
+
+          s = WEBrick::HTTPServer.new(webrick_options(options))
+          s.unmount("")
+
+          s.mount(
+            options['baseurl'],
+            WEBrick::HTTPServlet::FileHandler,
+            destination,
+            file_handler_options
+          )
+
+          Jekyll.logger.info "Server address:", server_address(s, options)
+
+          if options['detach'] # detach the server
+            pid = Process.fork { s.start }
+            Process.detach(pid)
+            Jekyll.logger.info "Server detached with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
+          else # create a new server thread, then join it with current terminal
+            t = Thread.new { s.start }
+            trap("INT") { s.shutdown }
+            t.join
+          end
+        end
+
+        def setup(destination)
+          require 'webrick'
+
+          FileUtils.mkdir_p(destination)
+
+          # monkey patch WEBrick using custom 404 page (/404.html)
+          if File.exist?(File.join(destination, '404.html'))
+            WEBrick::HTTPResponse.class_eval do
+              def create_error_page
+                @header['content-type'] = "text/html; charset=UTF-8"
+                @body = IO.read(File.join(@config[:DocumentRoot], '404.html'))
+              end
+            end
+          end
+        end
+
+        def webrick_options(config)
+          opts = {
+            :DocumentRoot       => config['destination'],
+            :Port               => config['port'],
+            :BindAddress        => config['host'],
+            :MimeTypes          => mime_types,
+            :DoNotReverseLookup => true,
+            :StartCallback      => start_callback(config['detach']),
+            :DirectoryIndex     => %w(index.html index.htm index.cgi index.rhtml index.xml)
+          }
+
+          if !config['verbose']
+            opts.merge!({
+              :AccessLog => [],
+              :Logger => WEBrick::Log.new([], WEBrick::Log::WARN)
+            })
+          end
+
+          opts
+        end
+
+        def start_callback(detached)
+          unless detached
+            Proc.new { Jekyll.logger.info "Server running...", "press ctrl-c to stop." }
+          end
+        end
+
+        def mime_types
+          mime_types_file = File.expand_path('../mime.types', File.dirname(__FILE__))
+          WEBrick::HTTPUtils::load_mime_types(mime_types_file)
+        end
+
+        def server_address(server, options)
+          baseurl = "#{options['baseurl']}/" if options['baseurl']
+          [
+            "http://",
+            server.config[:BindAddress],
+            ":",
+            server.config[:Port],
+            baseurl || ""
+          ].map(&:to_s).join("")
+        end

        # recreate NondisclosureName under utf-8 circumstance
-        fh_option = WEBrick::Config::FileHandler
-        fh_option[:NondisclosureName] = ['.ht*','~*']
-
-        s = HTTPServer.new(webrick_options(options))
-
-        s.mount(options['baseurl'], HTTPServlet::FileHandler, destination, fh_option)
-
-        Jekyll.logger.info "Server address:", "http://#{s.config[:BindAddress]}:#{s.config[:Port]}"
-
-        if options['detach'] # detach the server
-          pid = Process.fork { s.start }
-          Process.detach(pid)
-          Jekyll.logger.info "Server detatched with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
-        else # create a new server thread, then join it with current terminal
-          t = Thread.new { s.start }
-          trap("INT") { s.shutdown }
-          t.join()
-        end
-      end
-
-      def self.webrick_options(config)
-        opts = {
-          :Port => config['port'],
-          :BindAddress => config['host'],
-          :MimeTypes => self.mime_types,
-          :DoNotReverseLookup => true,
-          :StartCallback => start_callback(config['detach'])
-        }
-
-        if !config['verbose']
-          opts.merge!({
-            :AccessLog => [],
-            :Logger => Log::new([], Log::WARN)
-          })
+        def file_handler_options
+          fh_option = WEBrick::Config::FileHandler
+          fh_option[:NondisclosureName] = ['.ht*','~*']
+          fh_option
        end

-        opts
      end

-      def self.start_callback(detached)
-        unless detached
-          Proc.new { Jekyll.logger.info "Server running...", "press ctrl-c to stop." }
-        end
-      end
-
-      def self.mime_types
-        mime_types_file = File.expand_path('../mime.types', File.dirname(__FILE__))
-        WEBrick::HTTPUtils::load_mime_types(mime_types_file)
-      end
    end
  end
 end
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -13,10 +13,11 @@ module Jekyll
      'data_source'   =>  '_data',
      'keep_files'    => ['.git','.svn'],
      'gems'          => [],
+      'collections'   => nil,

      'timezone'      => nil,           # use the local timezone

-      'encoding'      => nil,           # use the system encoding
+      'encoding'      => 'utf-8',       # always use utf-8 encoding. NEVER FORGET

      'safe'          => false,
      'detach'        => false,          # default to not detaching the server
@@ -24,19 +25,19 @@ module Jekyll
      'limit_posts'   => 0,
      'lsi'           => false,
      'future'        => true,           # remove and make true just default
-      'pygments'      => true,
+      'unpublished'   => false,

-      'relative_permalinks' => true,     # backwards-compatibility with < 1.0
-                                         # will be set to false once 2.0 hits
+      'relative_permalinks' => false,

-      'markdown'      => 'maruku',
+      'markdown'      => 'kramdown',
+      'highlighter'   => 'pygments',
      'permalink'     => 'date',
      'baseurl'       => '/',
      'include'       => ['.htaccess'],
      'exclude'       => [],
      'paginate_path' => '/page:num',

-      'markdown_ext'  => 'markdown,mkd,mkdn,md',
+      'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
      'textile_ext'   => 'textile',

      'port'          => '4000',
@@ -44,12 +45,15 @@ module Jekyll

      'excerpt_separator' => "\n\n",

+      'defaults'     => [],
+
      'maruku' => {
        'use_tex'    => false,
        'use_divs'   => false,
        'png_engine' => 'blahtex',
        'png_dir'    => 'images/latex',
-        'png_url'    => '/images/latex'
+        'png_url'    => '/images/latex',
+        'fenced_code_blocks' => true
      },

      'rdiscount' => {
@@ -104,7 +108,7 @@ module Jekyll
      when '.toml'
        TOML.load_file(filename)
      when /\.y(a)?ml/
-        YAML.safe_load_file(filename)
+        SafeYAML.load_file(filename)
      else
        raise ArgumentError, "No parser for '#{filename}' is available. Use a .toml or .y(a)ml file instead."
      end
@@ -158,7 +162,7 @@ module Jekyll
      begin
        files.each do |config_file|
          new_config = read_config_file(config_file)
-          configuration = configuration.deep_merge(new_config)
+          configuration = Utils.deep_merge_hashes(configuration, new_config)
        end
      rescue ArgumentError => err
        Jekyll.logger.warn "WARNING:", "Error reading configuration. " +
@@ -209,6 +213,16 @@ module Jekyll
        config.delete('server_port')
      end

+      if config.has_key? 'pygments'
+        Jekyll.logger.warn "Deprecation:", "The 'pygments' configuration option" +
+                            " has been renamed to 'highlighter'. Please update your" +
+                            " config file accordingly. The allowed values are 'rouge', " +
+                            "'pygments' or null."
+
+        config['highlighter'] = 'pygments' if config['pygments']
+        config.delete('pygments')
+      end
+
      %w[include exclude].each do |option|
        if config.fetch(option, []).is_a?(String)
          Jekyll.logger.warn "Deprecation:", "The '#{option}' configuration option" +
@@ -218,6 +232,12 @@ module Jekyll
          config[option] = csv_to_array(config[option])
        end
      end
+
+      if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku")
+        Jekyll::Deprecator.deprecation_message "You're using the 'maruku' " +
+          "Markdown processor. Maruku support has been deprecated and will " +
+          "be removed in 3.0.0. We recommend you switch to Kramdown."
+      end
      config
    end

@@ -232,6 +252,5 @@ module Jekyll

      config
    end
-
  end
 end
--- a/lib/jekyll/converter.rb
+++ b/lib/jekyll/converter.rb
@@ -1,27 +1,27 @@
 module Jekyll
  class Converter < Plugin
-    # Public: Get or set the pygments prefix. When an argument is specified,
+    # Public: Get or set the highlighter prefix. When an argument is specified,
    # the prefix will be set. If no argument is specified, the current prefix
    # will be returned.
    #
-    # pygments_prefix - The String prefix (default: nil).
+    # highlighter_prefix - The String prefix (default: nil).
    #
    # Returns the String prefix.
-    def self.pygments_prefix(pygments_prefix = nil)
-      @pygments_prefix = pygments_prefix if pygments_prefix
-      @pygments_prefix
+    def self.highlighter_prefix(highlighter_prefix = nil)
+      @highlighter_prefix = highlighter_prefix if highlighter_prefix
+      @highlighter_prefix
    end

-    # Public: Get or set the pygments suffix. When an argument is specified,
+    # Public: Get or set the highlighter suffix. When an argument is specified,
    # the suffix will be set. If no argument is specified, the current suffix
    # will be returned.
    #
-    # pygments_suffix - The String suffix (default: nil).
+    # highlighter_suffix - The String suffix (default: nil).
    #
    # Returns the String suffix.
-    def self.pygments_suffix(pygments_suffix = nil)
-      @pygments_suffix = pygments_suffix if pygments_suffix
-      @pygments_suffix
+    def self.highlighter_suffix(highlighter_suffix = nil)
+      @highlighter_suffix = highlighter_suffix if highlighter_suffix
+      @highlighter_suffix
    end

    # Initialize the converter.
@@ -31,18 +31,18 @@ module Jekyll
      @config = config
    end

-    # Get the pygments prefix.
+    # Get the highlighter prefix.
    #
    # Returns the String prefix.
-    def pygments_prefix
-      self.class.pygments_prefix
+    def highlighter_prefix
+      self.class.highlighter_prefix
    end

-    # Get the pygments suffix.
+    # Get the highlighter suffix.
    #
    # Returns the String suffix.
-    def pygments_suffix
-      self.class.pygments_suffix
+    def highlighter_suffix
+      self.class.highlighter_suffix
    end
  end
 end
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -3,25 +3,27 @@ module Jekyll
    class Markdown < Converter
      safe true

-      pygments_prefix "\n"
-      pygments_suffix "\n"
+      highlighter_prefix "\n"
+      highlighter_suffix "\n"

      def setup
        return if @setup
-        @parser = case @config['markdown']
-          when 'redcarpet'
-            RedcarpetParser.new @config
-          when 'kramdown'
-            KramdownParser.new @config
-          when 'rdiscount'
-            RDiscountParser.new @config
-          when 'maruku'
-            MarukuParser.new @config
+        @parser =
+          case @config['markdown'].downcase
+            when 'redcarpet' then RedcarpetParser.new(@config)
+            when 'kramdown' then KramdownParser.new(@config)
+            when 'rdiscount' then RDiscountParser.new(@config)
+            when 'maruku' then MarukuParser.new(@config)
          else
-            STDERR.puts "Invalid Markdown processor: #{@config['markdown']}"
-            STDERR.puts "  Valid options are [ maruku | rdiscount | kramdown | redcarpet ]"
-            raise FatalException.new("Invalid Markdown process: #{@config['markdown']}")
-        end
+            # So they can't try some tricky bullshit or go down the ancestor chain, I hope.
+            if allowed_custom_class?(@config['markdown'])
+              self.class.const_get(@config['markdown']).new(@config)
+            else
+              Jekyll.logger.error "Invalid Markdown Processor:", "#{@config['markdown']}"
+              Jekyll.logger.error "", "Valid options are [ maruku | rdiscount | kramdown | redcarpet ]"
+              raise FatalException, "Invalid Markdown Processor: #{@config['markdown']}"
+            end
+          end
        @setup = true
      end

@@ -38,6 +40,19 @@ module Jekyll
        setup
        @parser.convert(content)
      end
+
+      private
+
+      # Private: Determine whether a class name is an allowed custom markdown
+      # class name
+      #
+      # parser_name - the name of the parser class
+      #
+      # Returns true if the parser name contains only alphanumeric characters
+      # and is defined within Jekyll::Converters::Markdown
+      def allowed_custom_class?(parser_name)
+        parser_name !~ /[^A-Za-z0-9]/ && self.class.constants.include?(parser_name.to_sym)
+      end
    end
  end
 end
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -20,7 +20,7 @@ module Jekyll
            end
          end

-          Kramdown::Document.new(content, @config["kramdown"].symbolize_keys).to_html
+          Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config["kramdown"])).to_html
        end

      end
--- a/lib/jekyll/converters/markdown/maruku_parser.rb
+++ b/lib/jekyll/converters/markdown/maruku_parser.rb
@@ -8,6 +8,10 @@ module Jekyll
          @errors = []
          load_divs_library if @config['maruku']['use_divs']
          load_blahtext_library if @config['maruku']['use_tex']
+
+          # allow fenced code blocks (new in Maruku 0.7.0)
+          MaRuKu::Globals[:fenced_code_blocks] = !!@config['maruku']['fenced_code_blocks']
+
        rescue LoadError
          STDERR.puts 'You are missing a library required for Markdown. Please run:'
          STDERR.puts '  $ [sudo] gem install maruku'
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -5,7 +5,8 @@ module Jekyll

        module CommonMethods
          def add_code_tags(code, lang)
-            code = code.sub(/<pre>/, "<pre><code class=\"#{lang} language-#{lang}\" data-lang=\"#{lang}\">")
+            code = code.to_s
+            code = code.sub(/<pre>/, "<pre><code class=\"language-#{lang}\" data-lang=\"#{lang}\">")
            code = code.sub(/<\/pre>/,"</code></pre>")
          end
        end
@@ -15,14 +16,14 @@ module Jekyll
          def block_code(code, lang)
            require 'pygments'
            lang = lang && lang.split.first || "text"
-            output = add_code_tags(
+            add_code_tags(
              Pygments.highlight(code, :lexer => lang, :options => { :encoding => 'utf-8' }),
              lang
            )
          end
        end

-        module WithoutPygments
+        module WithoutHighlighting
          require 'cgi'

          include CommonMethods
@@ -33,23 +34,53 @@ module Jekyll

          def block_code(code, lang)
            lang = lang && lang.split.first || "text"
-            output = add_code_tags(code_wrap(code), lang)
+            add_code_tags(code_wrap(code), lang)
          end
        end

+        module WithRouge
+          def block_code(code, lang)
+            code = "<pre>#{super}</pre>"
+
+            output = "<div class=\"highlight\">"
+            output << add_code_tags(code, lang)
+            output << "</div>"
+          end
+
+          protected
+          def rouge_formatter(opts = {})
+            Rouge::Formatters::HTML.new(opts.merge(wrap: false))
+          end
+        end
+
+
        def initialize(config)
          require 'redcarpet'
          @config = config
          @redcarpet_extensions = {}
          @config['redcarpet']['extensions'].each { |e| @redcarpet_extensions[e.to_sym] = true }

-          @renderer ||= if @config['pygments']
+          @renderer ||= case @config['highlighter']
+                        when 'pygments'
                          Class.new(Redcarpet::Render::HTML) do
                            include WithPygments
                          end
+                        when 'rouge'
+                          Class.new(Redcarpet::Render::HTML) do
+                            require 'rouge'
+                            require 'rouge/plugins/redcarpet'
+
+                            if Rouge.version < '1.3.0'
+                              abort "Please install Rouge 1.3.0 or greater and try running Jekyll again."
+                            end
+
+                            include Rouge::Plugins::Redcarpet
+                            include CommonMethods
+                            include WithRouge
+                          end
                        else
                          Class.new(Redcarpet::Render::HTML) do
-                            include WithoutPygments
+                            include WithoutHighlighting
                          end
                        end
        rescue LoadError
--- a/lib/jekyll/converters/textile.rb
+++ b/lib/jekyll/converters/textile.rb
@@ -3,8 +3,8 @@ module Jekyll
    class Textile < Converter
      safe true

-      pygments_prefix '<notextile>'
-      pygments_suffix '</notextile>'
+      highlighter_prefix '<notextile>'
+      highlighter_suffix '</notextile>'

      def setup
        return if @setup
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -13,17 +13,25 @@ require 'set'
 #   self.ext=
 #   self.output=
 #   self.name
+#   self.path
+#   self.type -> :page, :post or :draft
+
 module Jekyll
  module Convertible
    # Returns the contents as a String.
    def to_s
-      self.content || ''
+      content || ''
    end

-    # Returns merged optin hash for File.read of self.site (if exists)
+    # Whether the file is published or not, as indicated in YAML front-matter
+    def published?
+      !(data.has_key?('published') && data['published'] == false)
+    end
+
+    # Returns merged option hash for File.read of self.site (if exists)
    # and a given param
    def merged_file_read_opts(opts)
-      (self.site ? self.site.file_read_opts : {}).merge(opts)
+      (site ? site.file_read_opts : {}).merge(opts)
    end

    # Read the YAML frontmatter.
@@ -35,16 +43,16 @@ module Jekyll
    # Returns nothing.
    def read_yaml(base, name, opts = {})
      begin
-        self.content = File.read_with_options(File.join(base, name),
-                                              merged_file_read_opts(opts))
-        if self.content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
+        self.content = File.read(File.join(base, name),
+                                 merged_file_read_opts(opts))
+        if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
          self.content = $POSTMATCH
-          self.data = YAML.safe_load($1)
+          self.data = SafeYAML.load($1)
        end
      rescue SyntaxError => e
-        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"
+        Jekyll.logger.warn "YAML Exception reading #{File.join(base, name)}: #{e.message}"
      rescue Exception => e
-        puts "Error reading file #{File.join(base, name)}: #{e.message}"
+        Jekyll.logger.warn "Error reading file #{File.join(base, name)}: #{e.message}"
      end

      self.data ||= {}
@@ -54,10 +62,10 @@ module Jekyll
    #
    # Returns nothing.
    def transform
-      self.content = converter.convert(self.content)
+      self.content = converter.convert(content)
    rescue => e
      Jekyll.logger.error "Conversion error:", "There was an error converting" +
-        " '#{self.path}'."
+        " '#{path}'."
      raise e
    end

@@ -66,7 +74,7 @@ module Jekyll
    # Returns the String extension for the output file.
    #   e.g. ".html" for an HTML output file.
    def output_ext
-      converter.output_ext(self.ext)
+      converter.output_ext(ext)
    end

    # Determine which converter to use based on this convertible's
@@ -74,7 +82,7 @@ module Jekyll
    #
    # Returns the Converter instance.
    def converter
-      @converter ||= self.site.converters.find { |c| c.matches(self.ext) }
+      @converter ||= site.converters.find { |c| c.matches(ext) }
    end

    # Render Liquid in the content
@@ -101,7 +109,19 @@ module Jekyll
      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map { |attribute|
        [attribute, send(attribute)]
      }]
-      data.deep_merge(further_data)
+
+      defaults = site.frontmatter_defaults.all(relative_path, type)
+      Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data)
+    end
+
+    def type
+      if is_a?(Post)
+        :post
+      elsif is_a?(Page)
+        :page
+      elsif is_a?(Draft)
+        :draft
+      end
    end

    # Recursively render layouts
@@ -113,16 +133,16 @@ module Jekyll
    # Returns nothing
    def render_all_layouts(layouts, payload, info)
      # recursively render layouts
-      layout = layouts[self.data["layout"]]
+      layout = layouts[data["layout"]]
      used = Set.new([layout])

      while layout
-        payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
+        payload = Utils.deep_merge_hashes(payload, {"content" => output, "page" => layout.data})

-        self.output = self.render_liquid(layout.content,
+        self.output = render_liquid(layout.content,
                                         payload,
                                         info,
-                                         File.join(self.site.config['layouts'], layout.name))
+                                         File.join(site.config['layouts'], layout.name))

        if layout = layouts[layout.data["layout"]]
          if used.include?(layout)
@@ -141,21 +161,19 @@ module Jekyll
    #
    # Returns nothing.
    def do_layout(payload, layouts)
-      info = { :filters => [Jekyll::Filters], :registers => { :site => self.site, :page => payload['page'] } }
+      info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload['page'] } }

      # render and transform content (this becomes the final content of the object)
-      payload["pygments_prefix"] = converter.pygments_prefix
-      payload["pygments_suffix"] = converter.pygments_suffix
+      payload["highlighter_prefix"] = converter.highlighter_prefix
+      payload["highlighter_suffix"] = converter.highlighter_suffix

-      self.content = self.render_liquid(self.content,
-                                        payload,
-                                        info)
-      self.transform
+      self.content = render_liquid(content, payload, info)
+      transform

      # output keeps track of what will finally be written
-      self.output = self.content
+      self.output = content

-      self.render_all_layouts(layouts, payload, info)
+      render_all_layouts(layouts, payload, info)
    end

    # Write the generated page file to the destination directory.
@@ -167,7 +185,20 @@ module Jekyll
      path = destination(dest)
      FileUtils.mkdir_p(File.dirname(path))
      File.open(path, 'wb') do |f|
-        f.write(self.output)
+        f.write(output)
+      end
+    end
+
+    # Accessor for data properties by Liquid.
+    #
+    # property - The String name of the property to retrieve.
+    #
+    # Returns the String value or nil if the property isn't included.
+    def [](property)
+      if self.class::ATTRIBUTES_FOR_LIQUID.include?(property)
+        send(property)
+      else
+        data[property]
      end
    end
  end
--- a/lib/jekyll/core_ext.rb
+++ b/lib/jekyll/core_ext.rb
@@ -1,86 +0,0 @@
-class Hash
-  # Merges self with another hash, recursively.
-  #
-  # This code was lovingly stolen from some random gem:
-  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
-  #
-  # Thanks to whoever made it.
-  def deep_merge(hash)
-    target = dup
-
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        target[key] = target[key].deep_merge(hash[key])
-        next
-      end
-
-      target[key] = hash[key]
-    end
-
-    target
-  end
-
-  # Read array from the supplied hash favouring the singular key
-  # and then the plural key, and handling any nil entries.
-  #   +hash+ the hash to read from
-  #   +singular_key+ the singular key
-  #   +plural_key+ the plural key
-  #
-  # Returns an array
-  def pluralized_array(singular_key, plural_key)
-    hash = self
-    if hash.has_key?(singular_key)
-      array = [hash[singular_key]] if hash[singular_key]
-    elsif hash.has_key?(plural_key)
-      case hash[plural_key]
-      when String
-        array = hash[plural_key].split
-      when Array
-        array = hash[plural_key].compact
-      end
-    end
-    array || []
-  end
-
-  def symbolize_keys!
-    keys.each do |key|
-      self[(key.to_sym rescue key) || key] = delete(key)
-    end
-    self
-  end
-
-  def symbolize_keys
-    dup.symbolize_keys!
-  end
-end
-
-# Thanks, ActiveSupport!
-class Date
-  # Converts datetime to an appropriate format for use in XML
-  def xmlschema
-    strftime("%Y-%m-%dT%H:%M:%S%Z")
-  end if RUBY_VERSION < '1.9'
-end
-
-module Enumerable
-  # Returns true if path matches against any glob pattern.
-  # Look for more detail about glob pattern in method File::fnmatch.
-  def glob_include?(e)
-    any? { |exp| File.fnmatch?(exp, e) }
-  end
-end
-
-# Ruby 1.8's File.read don't support option.
-# read_with_options ignore optional parameter for 1.8,
-# and act as alias for 1.9 or later.
-class File
-  if RUBY_VERSION < '1.9'
-    def self.read_with_options(path, opts = {})
-      self.read(path)
-    end
-  else
-    def self.read_with_options(path, opts = {})
-      self.read(path, opts)
-    end
-  end
-end
--- a/lib/jekyll/deprecator.rb
+++ b/lib/jekyll/deprecator.rb
@@ -9,8 +9,8 @@ module Jekyll
      arg_is_present? args, "--auto", "The switch '--auto' has been replaced with '--watch'."
      arg_is_present? args, "--no-auto", "To disable auto-replication, simply leave off \
                          the '--watch' switch."
-      arg_is_present? args, "--pygments", "The 'pygments' setting can only be set in \
-                          your config files."
+      arg_is_present? args, "--pygments", "The 'pygments'settings has been removed in \
+                          favour of 'highlighter'."
      arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \
                          config files."
      arg_is_present? args, "--url", "The 'url' setting can only be set in your config files."
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -0,0 +1,242 @@
+module Jekyll
+  class Document
+    include Comparable
+
+    attr_reader   :path, :site
+    attr_accessor :content, :collection, :output
+
+    # Create a new Document.
+    #
+    # site - the Jekyll::Site instance to which this Document belongs
+    # path - the path to the file
+    #
+    # Returns nothing.
+    def initialize(path, relations)
+      @site = relations[:site]
+      @path = path
+      @collection = relations[:collection]
+    end
+
+    # Fetch the Document's data.
+    #
+    # Returns a Hash containing the data. An empty hash is returned if
+    #   no data was read.
+    def data
+      @data ||= Hash.new
+    end
+
+    # The path to the document, relative to the site source.
+    #
+    # Returns a String path which represents the relative path
+    #   from the site source to this document
+    def relative_path
+      Pathname.new(path).relative_path_from(Pathname.new(site.source)).to_s
+    end
+
+    # The base filename of the document.
+    #
+    # suffix - (optional) the suffix to be removed from the end of the filename
+    #
+    # Returns the base filename of the document.
+    def basename(suffix = "")
+      File.basename(path, suffix)
+    end
+
+    # The extension name of the document.
+    #
+    # Returns the extension name of the document.
+    def extname
+      File.extname(path)
+    end
+
+    # Produces a "cleaned" relative path.
+    # The "cleaned" relative path is the relative path without the extname
+    #   and with the collection's directory removed as well.
+    # This method is useful when building the URL of the document.
+    #
+    # Examples:
+    #   When relative_path is "_methods/site/generate.md":
+    #     cleaned_relative_path
+    #     # => "/site/generate"
+    #
+    # Returns the cleaned relative path of the document.
+    def cleaned_relative_path
+      relative_path[0 .. -extname.length - 1].sub(collection.relative_directory, "")
+    end
+
+    # Determine whether the document is a YAML file.
+    #
+    # Returns true if the extname is either .yml or .yaml, false otherwise.
+    def yaml_file?
+      %w[.yaml .yml].include?(extname)
+    end
+
+    # Determine whether the document is an asset file.
+    # Asset files include CoffeeScript files and Sass/SCSS files.
+    #
+    # Returns true if the extname belongs to the set of extensions
+    #   that asset files use.
+    def asset_file?
+      %w[.sass .scss .coffee].include?(extname)
+    end
+
+    # Determine whether the file should be rendered with Liquid.
+    #
+    # Returns false if the document is either an asset file or a yaml file,
+    #   true otherwise.
+    def render_with_liquid?
+      !(asset_file? || yaml_file?)
+    end
+
+    # The URL template where the document would be accessible.
+    #
+    # Returns the URL template for the document.
+    def url_template
+      "/:collection/:path:output_ext"
+    end
+
+    # Construct a Hash of key-value pairs which contain a mapping between
+    #   a key in the URL template and the corresponding value for this document.
+    #
+    # Returns the Hash of key-value pairs for replacement in the URL.
+    def url_placeholders
+      {
+        collection: collection.label,
+        path:       cleaned_relative_path,
+        output_ext: Jekyll::Renderer.new(site, self).output_ext
+      }
+    end
+
+    # The permalink for this Document.
+    # Permalink is set via the data Hash.
+    #
+    # Returns the permalink or nil if no permalink was set in the data.
+    def permalink
+      data && data.is_a?(Hash) && data['permalink']
+    end
+
+    # The computed URL for the document. See `Jekyll::URL#to_s` for more details.
+    #
+    # Returns the computed URL for the document.
+    def url
+      @url ||= URL.new({
+        template:     url_template,
+        placeholders: url_placeholders,
+        permalink:    permalink
+      }).to_s
+    end
+
+    # The full path to the output file.
+    #
+    # base_directory - the base path of the output directory
+    #
+    # Returns the full path to the output file of this document.
+    def destination(base_directory)
+      path = Jekyll.sanitized_path(base_directory, url)
+      path = File.join(path, "index.html") if url =~ /\/$/
+      path
+    end
+
+    # Write the generated Document file to the destination directory.
+    #
+    # dest - The String path to the destination dir.
+    #
+    # Returns nothing.
+    def write(dest)
+      path = destination(dest)
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(path, 'wb') do |f|
+        f.write(output)
+      end
+    end
+
+    # Returns merged option hash for File.read of self.site (if exists)
+    # and a given param
+    #
+    # opts - override options
+    #
+    # Return the file read options hash.
+    def merged_file_read_opts(opts)
+      site ? site.file_read_opts.merge(opts) : opts
+    end
+
+    # Whether the file is published or not, as indicated in YAML front-matter
+    #
+    # Returns true if the 'published' key is specified in the YAML front-matter and not `false`.
+    def published?
+      !(data.has_key?('published') && data['published'] == false)
+    end
+
+    # Read in the file and assign the content and data based on the file contents.
+    #
+    # Returns nothing.
+    def read(opts = {})
+      if yaml_file?
+        @data = SafeYAML.load_file(path)
+      else
+        begin
+          @content = File.read(path, merged_file_read_opts(opts))
+          if content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
+            @content = $POSTMATCH
+            @data    = SafeYAML.load($1)
+          end
+        rescue SyntaxError => e
+          puts "YAML Exception reading #{path}: #{e.message}"
+        rescue Exception => e
+          puts "Error reading file #{path}: #{e.message}"
+        end
+      end
+    end
+
+    # Create a Liquid-understandable version of this Document.
+    #
+    # Returns a Hash representing this Document's data.
+    def to_liquid
+      if data.is_a?(Hash)
+        Utils.deep_merge_hashes data, {
+          "output"        => output,
+          "content"       => content,
+          "path"          => path,
+          "relative_path" => relative_path,
+          "url"           => url
+        }
+      else
+        data
+      end
+    end
+
+    # The inspect string for this document.
+    # Includes the relative path and the collection label.
+    #
+    # Returns the inspect string for this document.
+    def inspect
+      "#<Jekyll::Document #{relative_path} collection=#{collection.label}>"
+    end
+
+    # The string representation for this document.
+    #
+    # Returns the content of the document
+    def to_s
+      output || content
+    end
+
+    # Compare this document against another document.
+    # Comparison is a comparison between the 2 paths of the documents.
+    #
+    # Returns -1, 0, +1 or nil depending on whether this doc's path is less than,
+    #   equal or greater than the other doc's path. See String#<=> for more details.
+    def <=>(anotherDocument)
+      path <=> anotherDocument.path
+    end
+
+    # Determine whether this document should be written.
+    # Based on the Collection to which it belongs.
+    #
+    # True if the document has a collection and if that collection's #write?
+    #   method returns true, otherwise false.
+    def write?
+      collection && collection.write?
+    end
+
+  end
+end
--- a/lib/jekyll/draft.rb
+++ b/lib/jekyll/draft.rb
@@ -18,6 +18,11 @@ module Jekyll
      File.join(source, dir, '_drafts')
    end

+    # The path to the draft source file, relative to the site source
+    def relative_path
+      File.join(@dir, '_drafts', @name)
+    end
+
    # Extract information from the post filename.
    #
    # name - The String filename of the post file.
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -1,35 +1,72 @@
-class EntryFilter
-  attr_reader :site
-  def initialize(site)
-    @site = site
-  end
+module Jekyll
+  class EntryFilter
+    SPECIAL_LEADING_CHARACTERS = ['.', '_', '#'].freeze

-  def filter(entries)
-    entries.reject do |e|
-      unless included?(e)
-        special?(e) || backup?(e) || excluded?(e) || symlink?(e)
+    attr_reader :site
+
+    def initialize(site, base_directory = nil)
+      @site = site
+      @base_directory = derive_base_directory(@site, base_directory.to_s.dup)
+    end
+
+    def base_directory
+      @base_directory.to_s
+    end
+
+    def derive_base_directory(site, base_dir)
+      if base_dir.start_with?(site.source)
+        base_dir[site.source] = ""
+      end
+      base_dir
+    end
+
+    def relative_to_source(entry)
+      File.join(base_directory, entry)
+    end
+
+    def filter(entries)
+      entries.reject do |e|
+        unless included?(e)
+          special?(e) || backup?(e) || excluded?(e) || symlink?(e)
+        end
+      end
+    end
+
+    def included?(entry)
+      glob_include?(site.include, entry)
+    end
+
+    def special?(entry)
+      SPECIAL_LEADING_CHARACTERS.include?(entry[0..0]) ||
+        SPECIAL_LEADING_CHARACTERS.include?(File.basename(entry)[0..0])
+    end
+
+    def backup?(entry)
+      entry[-1..-1] == '~'
+    end
+
+    def excluded?(entry)
+      excluded = glob_include?(site.exclude, relative_to_source(entry))
+      Jekyll.logger.debug "excluded?(#{relative_to_source(entry)}) ==> #{excluded}"
+      excluded
+    end
+
+    def symlink?(entry)
+      File.symlink?(entry) && site.safe
+    end
+
+    def ensure_leading_slash(path)
+      path[0..0] == "/" ? path : "/#{path}"
+    end
+
+    # Returns true if path matches against any glob pattern.
+    # Look for more detail about glob pattern in method File::fnmatch.
+    def glob_include?(enum, e)
+      entry = ensure_leading_slash(e)
+      enum.any? do |exp|
+        item = ensure_leading_slash(exp)
+        File.fnmatch?(item, entry) || entry.start_with?(item)
      end
    end
  end
-
-  def included?(entry)
-    site.include.glob_include?(entry)
-  end
-
-  def special?(entry)
-    ['.', '_', '#'].include?(entry[0..0])
-  end
-
-  def backup?(entry)
-    entry[-1..-1] == '~'
-  end
-
-  def excluded?(entry)
-    site.exclude.glob_include?(entry)
-  end
-
-  def symlink?(entry)
-    File.symlink?(entry) && site.safe
-  end
-
 end
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -1,10 +1,18 @@
+require 'jekyll/convertible'
+require 'forwardable'
+
 module Jekyll
  class Excerpt
    include Convertible
+    extend Forwardable

    attr_accessor :post
    attr_accessor :content, :output, :ext

+    def_delegator :@post, :site, :site
+    def_delegator :@post, :name, :name
+    def_delegator :@post, :ext,  :ext
+
    # Initialize this Post instance.
    #
    # site       - The Site.
@@ -17,12 +25,6 @@ module Jekyll
      self.content = extract_excerpt(post.content)
    end

-    %w[site name ext].each do |meth|
-      define_method(meth) do
-        post.send(meth)
-      end
-    end
-
    def to_liquid
      post.to_liquid(Post::EXCERPT_ATTRIBUTES_FOR_LIQUID)
    end
@@ -37,7 +39,7 @@ module Jekyll
    end

    # 'Path' of the excerpt.
-    # 
+    #
    # Returns the path for the post this excerpt belongs to with #excerpt appended
    def path
      File.join(post.path, "#excerpt")
@@ -45,9 +47,9 @@ module Jekyll

    # Check if excerpt includes a string
    #
-    # Returns true if the string passed in 
+    # Returns true if the string passed in
    def include?(something)
-      (self.output && self.output.include?(something)) || self.content.include?(something)
+      (output && output.include?(something)) || content.include?(something)
    end

    # The UID for this post (useful in feeds).
@@ -59,7 +61,7 @@ module Jekyll
    end

    def to_s
-      self.output || self.content
+      output || content
    end

    # Returns the shorthand String identifier of this Post.
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -83,7 +83,7 @@ module Jekyll
    #
    # Returns the escaped String.
    def xml_escape(input)
-      CGI.escapeHTML(input)
+      CGI.escapeHTML(input.to_s)
    end

    # CGI escape a string for use in a URL. Replaces any special characters
@@ -100,7 +100,7 @@ module Jekyll
    def cgi_escape(input)
      CGI::escape(input)
    end
-    
+
    # URI escape a string.
    #
    # input - The String to escape.
@@ -124,7 +124,7 @@ module Jekyll
      input.split.length
    end

-    # Join an array of things into a string by separating with commes and the
+    # Join an array of things into a string by separating with commas and the
    # word "and" for the last one.
    #
    # array - The Array of Strings to join.
@@ -158,6 +158,72 @@ module Jekyll
      input.to_json
    end

+    # Group an array of items by a property
+    #
+    # input - the inputted Enumerable
+    # property - the property
+    #
+    # Returns an array of Hashes, each looking something like this:
+    #  {"name"  => "larry"
+    #   "items" => [...] } # all the items where `property` == "larry"
+    def group_by(input, property)
+      if groupable?(input)
+        input.group_by do |item|
+          item_property(item, property).to_s
+        end.inject([]) do |memo, i|
+          memo << {"name" => i.first, "items" => i.last}
+        end
+      else
+        input
+      end
+    end
+
+    # Filter an array of objects
+    #
+    # input - the object array
+    # key - key within each object to filter by
+    # value - desired value
+    #
+    # Returns the filtered array of objects
+    def where(input, key, value)
+      return input unless input.is_a?(Array)
+      input.select { |object| object[key] == value }
+    end
+
+    # Sort an array of objects
+    #
+    # input - the object array
+    # key - key within each object to filter by
+    # nils ('first' | 'last') - nils appear before or after non-nil values
+    #
+    # Returns the filtered array of objects
+    def sort(input, key = nil, nils = "first")
+      if key.nil?
+        input.sort
+      else
+        case
+        when nils == "first"
+          order = - 1
+        when nils == "last"
+          order = + 1
+        else
+          Jekyll.logger.error "Invalid nils order:",
+            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'."
+          exit(1)
+        end
+
+        input.sort { |a, b|
+          if !a[key].nil? && b[key].nil?
+            - order
+          elsif a[key].nil? && !b[key].nil?
+            + order
+          else
+            a[key] <=> b[key]
+          end
+        }
+      end
+    end
+
    private
    def time(input)
      case input
@@ -170,5 +236,17 @@ module Jekyll
        exit(1)
      end
    end
+
+    def groupable?(element)
+      element.respond_to?(:group_by)
+    end
+
+    def item_property(item, property)
+      if item.respond_to?(:data)
+        item.data[property.to_s]
+      else
+        item[property.to_s]
+      end
+    end
  end
 end
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -0,0 +1,148 @@
+module Jekyll
+  class Configuration
+    # This class handles custom defaults for YAML frontmatter settings.
+    # These are set in _config.yml and apply both to internal use (e.g. layout)
+    # and the data available to liquid.
+    #
+    # It is exposed via the frontmatter_defaults method on the site class.
+    class FrontmatterDefaults
+      # Initializes a new instance.
+      def initialize(site)
+        @site = site
+      end
+
+      # Finds a default value for a given setting, filtered by path and type
+      #
+      # path - the path (relative to the source) of the page, post or :draft the default is used in
+      # type - a symbol indicating whether a :page, a :post or a :draft calls this method
+      #
+      # Returns the default value or nil if none was found
+      def find(path, type, setting)
+        value = nil
+        old_scope = nil
+
+        matching_sets(path, type).each do |set|
+          if set['values'].has_key?(setting) && has_precedence?(old_scope, set['scope'])
+            value = set['values'][setting]
+            old_scope = set['scope']
+          end
+        end
+        value
+      end
+
+      # Collects a hash with all default values for a page or post
+      #
+      # path - the relative path of the page or post
+      # type - a symbol indicating the type (:post, :page or :draft)
+      #
+      # Returns a hash with all default values (an empty hash if there are none)
+      def all(path, type)
+        defaults = {}
+        old_scope = nil
+        matching_sets(path, type).each do |set|
+          if has_precedence?(old_scope, set['scope'])
+            defaults.merge! set['values']
+            old_scope = set['scope']
+          else
+            defaults = set['values'].merge(defaults)
+          end
+        end
+        defaults
+      end
+
+      private
+
+      # Checks if a given default setting scope matches the given path and type
+      #
+      # scope - the hash indicating the scope, as defined in _config.yml
+      # path - the path to check for
+      # type - the type (:post, :page or :draft) to check for
+      #
+      # Returns true if the scope applies to the given path and type
+      def applies?(scope, path, type)
+        applies_path?(scope, path) && applies_type?(scope, type)
+      end
+
+      def applies_path?(scope, path)
+        return true if scope['path'].empty?
+
+        scope_path = Pathname.new(scope['path'])
+        Pathname.new(sanitize_path(path)).ascend do |path|
+          if path == scope_path
+            return true
+          end
+        end
+      end
+
+      def applies_type?(scope, type)
+        !scope.has_key?('type') || scope['type'] == type.to_s
+      end
+
+      # Checks if a given set of default values is valid
+      #
+      # set - the default value hash, as defined in _config.yml
+      #
+      # Returns true if the set is valid and can be used in this class
+      def valid?(set)
+        set.is_a?(Hash) && set['scope'].is_a?(Hash) && set['scope']['path'].is_a?(String) && set['values'].is_a?(Hash)
+      end
+
+      # Determines if a new scope has precedence over an old one
+      #
+      # old_scope - the old scope hash, or nil if there's none
+      # new_scope - the new scope hash
+      #
+      # Returns true if the new scope has precedence over the older
+      def has_precedence?(old_scope, new_scope)
+        return true if old_scope.nil?
+
+        new_path = sanitize_path(new_scope['path'])
+        old_path = sanitize_path(old_scope['path'])
+
+        if new_path.length != old_path.length
+          new_path.length >= old_path.length
+        elsif new_scope.has_key? 'type'
+          true
+        else
+          !old_scope.has_key? 'type'
+        end
+      end
+
+      # Collects a list of sets that match the given path and type
+      #
+      # Returns an array of hashes
+      def matching_sets(path, type)
+        valid_sets.select do |set|
+          applies?(set['scope'], path, type)
+        end
+      end
+
+      # Returns a list of valid sets
+      #
+      # This is not cached to allow plugins to modify the configuration
+      # and have their changes take effect
+      #
+      # Returns an array of hashes
+      def valid_sets
+        sets = @site.config['defaults']
+        return [] unless sets.is_a?(Array)
+
+        sets.select do |set|
+          unless valid?(set)
+            Jekyll.logger.warn "Default:", "An invalid default set was found"
+          end
+          valid?(set)
+        end
+      end
+
+      # Sanitizes the given path by removing a leading and addding a trailing slash
+      def sanitize_path(path)
+        if path.nil? || path.empty?
+          ""
+        else
+          path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1/')
+        end
+      end
+    end
+  end
+end
--- a/lib/jekyll/layout.rb
+++ b/lib/jekyll/layout.rb
@@ -29,8 +29,8 @@ module Jekyll

      self.data = {}

-      self.process(name)
-      self.read_yaml(base, name)
+      process(name)
+      read_yaml(base, name)
    end

    # Extract information from the layout filename.
--- a/lib/jekyll/layout_reader.rb
+++ b/lib/jekyll/layout_reader.rb
@@ -0,0 +1,53 @@
+module Jekyll
+  class LayoutReader
+    attr_reader :site
+    def initialize(site)
+      @site = site
+      @layouts = {}
+    end
+
+    def read
+      layout_entries.each do |f|
+        @layouts[layout_name(f)] = Layout.new(site, layout_directory, f)
+      end
+
+      @layouts
+    end
+
+    def layout_directory
+      @layout_directory ||= (layout_directory_in_cwd || layout_directory_inside_source)
+    end
+
+    private
+
+    def layout_entries
+      entries = []
+      within(layout_directory) do
+        entries = EntryFilter.new(site).filter(Dir['**/*.*'])
+      end
+      entries
+    end
+
+    def layout_name(file)
+      file.split(".")[0..-2].join(".")
+    end
+
+    def within(directory)
+      return unless File.exist?(directory)
+      Dir.chdir(directory) { yield }
+    end
+
+    def layout_directory_inside_source
+      Jekyll.sanitized_path(site.source, site.config['layouts'])
+    end
+
+    def layout_directory_in_cwd
+      dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts'])
+      if File.directory?(dir)
+        dir
+      else
+        nil
+      end
+    end
+  end
+end
--- a/lib/jekyll/liquid_extensions.rb
+++ b/lib/jekyll/liquid_extensions.rb
@@ -0,0 +1,22 @@
+module Jekyll
+  module LiquidExtensions
+
+    # Lookup a Liquid variable in the given context.
+    #
+    # context  - the Liquid context in question.
+    # variable - the variable name, as a string.
+    #
+    # Returns the value of the variable in the context
+    #   or the variable name if not found.
+    def lookup_variable(context, variable)
+      lookup = context
+
+      variable.split(".").each do |value|
+        lookup = lookup[value]
+      end
+
+      lookup || variable
+    end
+
+  end
+end
--- a/lib/jekyll/mime.types
+++ b/lib/jekyll/mime.types
@@ -1,12 +1,13 @@
-# These are the same MIME types that GitHub Pages uses as of 17 Mar 2013.
+-# These are the same MIME types that GitHub Pages uses as of 26 January 2014

 text/html                             html htm shtml
 text/css                              css
-text/xml                              xml rss xsl
+text/xml                              xml rss xsl xsd
 image/gif                             gif
 image/jpeg                            jpeg jpg
 application/x-javascript              js
 application/atom+xml                  atom
+application/json                      json geojson topojson

 text/mathml                           mml
 text/plain                            txt
@@ -17,16 +18,22 @@ text/cache-manifest                   manifest appcache
 text/coffeescript                     coffee
 text/plain                            pde
 text/plain                            md markdown
+text/vcard                            vcf vcard

 image/png                             png
 image/svg+xml                         svg
+image/svg+xml                         svgz
 image/tiff                            tif tiff
 image/vnd.wap.wbmp                    wbmp
 image/x-icon                          ico
 image/x-jng                           jng
 image/x-ms-bmp                        bmp

-application/json                      json
+application/vnd.ms-fontobject         eot
+application/x-font-ttf                ttf
+application/x-font-woff               woff
+font/opentype                         otf
+
 application/java-archive              jar ear
 application/mac-binhex40              hqx
 application/msword                    doc
@@ -34,18 +41,19 @@ application/pdf                       pdf
 application/postscript                ps eps ai
 application/rdf+xml                   rdf
 application/rtf                       rtf
-text/vcard                            vcf vcard
 application/vnd.apple.pkpass          pkpass
 application/vnd.ms-excel              xls
 application/vnd.ms-powerpoint         ppt
 application/vnd.wap.wmlc              wmlc
 application/xhtml+xml                 xhtml
-application/x-chrome-extension        crx
 application/x-cocoa                   cco
-application/x-font-ttf                ttf
+application/x-chrome-extension        crx
 application/x-java-archive-diff       jardiff
 application/x-java-jnlp-file          jnlp
 application/x-makeself                run
+application/x-ms-application          application
+application/x-ms-manifest             manifest
+application/x-ms-vsto                 vsto
 application/x-ns-proxy-autoconfig     pac
 application/x-perl                    pl pm
 application/x-pilot                   prc pdb
@@ -63,8 +71,8 @@ application/zip                       zip

 application/octet-stream              bin exe dll
 application/octet-stream              deb
+application/octet-stream              deploy
 application/octet-stream              dmg
-application/octet-stream              eot
 application/octet-stream              iso img
 application/octet-stream              msi msp msm

@@ -74,12 +82,14 @@ audio/x-realaudio                     ra
 audio/ogg                             ogg

 video/3gpp                            3gpp 3gp
+video/m4v                             m4v
+video/mp4                             mp4
 video/mpeg                            mpeg mpg
+video/ogg                             ogg ogv
 video/quicktime                       mov
+video/webm                            webm
 video/x-flv                           flv
 video/x-mng                           mng
 video/x-ms-asf                        asx asf
 video/x-ms-wmv                        wmv
 video/x-msvideo                       avi
-video/ogg                             ogv
-video/webm                            webm
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -9,9 +9,11 @@ module Jekyll

    # Attributes for Liquid templates
    ATTRIBUTES_FOR_LIQUID = %w[
-      url
      content
+      dir
+      name
      path
+      url
    ]

    # Initialize a new Page.
@@ -26,8 +28,13 @@ module Jekyll
      @dir  = dir
      @name = name

-      self.process(name)
-      self.read_yaml(File.join(base, dir), name)
+
+      process(name)
+      read_yaml(File.join(base, dir), name)
+
+      data.default_proc = proc do |hash, key|
+        site.frontmatter_defaults.find(File.join(dir, name), type, key)
+      end
    end

    # The generated directory into which the page will be placed
@@ -44,11 +51,11 @@ module Jekyll
    #
    # Returns the String permalink or nil if none has been set.
    def permalink
-      return nil if self.data.nil? || self.data['permalink'].nil?
+      return nil if data.nil? || data['permalink'].nil?
      if site.config['relative_permalinks']
-        File.join(@dir, self.data['permalink'])
+        File.join(@dir, data['permalink'])
      else
-        self.data['permalink']
+        data['permalink']
      end
    end

@@ -56,7 +63,7 @@ module Jekyll
    #
    # Returns the template String.
    def template
-      if self.site.permalink_style == :pretty
+      if site.permalink_style == :pretty
        if index? && html?
          "/:path/"
        elsif html?
@@ -85,8 +92,8 @@ module Jekyll
    def url_placeholders
      {
        :path       => @dir,
-        :basename   => self.basename,
-        :output_ext => self.output_ext
+        :basename   => basename,
+        :output_ext => output_ext
      }
    end

@@ -97,7 +104,7 @@ module Jekyll
    # Returns nothing.
    def process(name)
      self.ext = File.extname(name)
-      self.basename = name[0 .. -self.ext.length-1]
+      self.basename = name[0 .. -ext.length - 1]
    end

    # Add any necessary layouts to this post
@@ -107,10 +114,10 @@ module Jekyll
    #
    # Returns nothing.
    def render(layouts, site_payload)
-      payload = {
-        "page" => self.to_liquid,
+      payload = Utils.deep_merge_hashes({
+        "page" => to_liquid,
        'paginator' => pager.to_liquid
-      }.deep_merge(site_payload)
+      }, site_payload)

      do_layout(payload, layouts)
    end
@@ -119,12 +126,12 @@ module Jekyll
    #
    # Returns the path to the source file
    def path
-      self.data.fetch('path', self.relative_path.sub(/\A\//, ''))
+      data.fetch('path', relative_path.sub(/\A\//, ''))
    end

    # The path to the page source file, relative to the site source
    def relative_path
-      File.join(@dir, @name)
+      File.join(*[@dir, @name].map(&:to_s).reject(&:empty?))
    end

    # Obtain destination path.
@@ -133,14 +140,14 @@ module Jekyll
    #
    # Returns the destination file path String.
    def destination(dest)
-      path = File.join(dest, self.url)
-      path = File.join(path, "index.html") if self.url =~ /\/$/
+      path = Jekyll.sanitized_path(dest, URL.unescape_path(url))
+      path = File.join(path, "index.html") if url =~ /\/$/
      path
    end

    # Returns the object as a debug String.
    def inspect
-      "#<Jekyll:Page @name=#{self.name.inspect}>"
+      "#<Jekyll:Page @name=#{name.inspect}>"
    end

    # Returns the Boolean of whether this Page is HTML or not.
@@ -154,7 +161,7 @@ module Jekyll
    end

    def uses_relative_permalinks
-      permalink && @dir != "" && site.config['relative_permalinks']
+      permalink && !@dir.empty? && site.config['relative_permalinks']
    end
  end
 end
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -0,0 +1,76 @@
+module Jekyll
+  class PluginManager
+    attr_reader :site
+
+    # Create an instance of this class.
+    #
+    # site - the instance of Jekyll::Site we're concerned with
+    #
+    # Returns nothing
+    def initialize(site)
+      @site = site
+    end
+
+    # Require all the plugins which are allowed.
+    #
+    # Returns nothing
+    def conscientious_require
+      require_plugin_files
+      require_gems
+    end
+
+    # Require each of the gem plugins specified.
+    #
+    # Returns nothing.
+    def require_gems
+      site.gems.each do |gem|
+        if plugin_allowed?(gem)
+          require gem
+        end
+      end
+    end
+
+    # Check whether a gem plugin is allowed to be used during this build.
+    #
+    # gem_name - the name of the gem
+    #
+    # Returns true if the gem name is in the whitelist or if the site is not
+    #   in safe mode.
+    def plugin_allowed?(gem_name)
+      !site.safe || whitelist.include?(gem_name)
+    end
+
+    # Build an array of allowed plugin gem names.
+    #
+    # Returns an array of strings, each string being the name of a gem name
+    #   that is allowed to be used.
+    def whitelist
+      @whitelist ||= Array[site.config['whitelist']].flatten
+    end
+
+    # Require all .rb files if safe mode is off
+    #
+    # Returns nothing.
+    def require_plugin_files
+      unless site.safe
+        plugins_path.each do |plugins|
+          Dir[File.join(plugins, "**", "*.rb")].sort.each do |f|
+            require f
+          end
+        end
+      end
+    end
+
+    # Public: Setup the plugin search path
+    #
+    # Returns an Array of plugin search paths
+    def plugins_path
+      if (site.config['plugins'] == Jekyll::Configuration::DEFAULTS['plugins'])
+        [Jekyll.sanitized_path(site.source, site.config['plugins'])]
+      else
+        Array(site.config['plugins']).map { |d| File.expand_path(d) }
+      end
+    end
+
+  end
+end
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -9,6 +9,7 @@ module Jekyll
    EXCERPT_ATTRIBUTES_FOR_LIQUID = %w[
      title
      url
+      dir
      date
      id
      categories
@@ -34,7 +35,7 @@ module Jekyll

    attr_accessor :site
    attr_accessor :data, :extracted_excerpt, :content, :output, :ext
-    attr_accessor :date, :slug, :published, :tags, :categories
+    attr_accessor :date, :slug, :tags, :categories

    attr_reader :name

@@ -48,25 +49,27 @@ module Jekyll
    def initialize(site, source, dir, name)
      @site = site
      @dir = dir
-      @base = self.containing_dir(source, dir)
+      @base = containing_dir(source, dir)
      @name = name

      self.categories = dir.downcase.split('/').reject { |x| x.empty? }
-      self.process(name)
-      self.read_yaml(@base, name)
+      process(name)
+      read_yaml(@base, name)

-      if self.data.has_key?('date')
-        self.date = Time.parse(self.data["date"].to_s)
+      data.default_proc = proc do |hash, key|
+        site.frontmatter_defaults.find(File.join(dir, name), type, key)
      end

-      self.published = self.published?
+      if data.has_key?('date')
+        self.date = Time.parse(data["date"].to_s)
+      end

-      self.populate_categories
-      self.populate_tags
+      populate_categories
+      populate_tags
    end

    def published?
-      if self.data.has_key?('published') && self.data['published'] == false
+      if data.has_key?('published') && data['published'] == false
        false
      else
        true
@@ -74,14 +77,14 @@ module Jekyll
    end

    def populate_categories
-      if self.categories.empty?
-        self.categories = self.data.pluralized_array('category', 'categories').map {|c| c.to_s.downcase}
+      if categories.empty?
+        self.categories = Utils.pluralized_array_from_hash(data, 'category', 'categories').map {|c| c.to_s.downcase}
      end
-      self.categories.flatten!
+      categories.flatten!
    end

    def populate_tags
-      self.tags = self.data.pluralized_array("tag", "tags").flatten
+      self.tags = Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
    end

    # Get the full path to the directory containing the post files
@@ -97,7 +100,7 @@ module Jekyll
    # Returns nothing.
    def read_yaml(base, name)
      super(base, name)
-      self.extracted_excerpt = self.extract_excerpt
+      self.extracted_excerpt = extract_excerpt
    end

    # The post excerpt. This is either a custom excerpt
@@ -105,19 +108,19 @@ module Jekyll
    #
    # Returns excerpt string.
    def excerpt
-      self.data.fetch('excerpt', self.extracted_excerpt.to_s)
+      data.fetch('excerpt', extracted_excerpt.to_s)
    end

    # Public: the Post title, from the YAML Front-Matter or from the slug
    #
    # Returns the post title
    def title
-      self.data.fetch("title", self.titleized_slug)
+      data.fetch("title", titleized_slug)
    end

    # Turns the post slug into a suitable title
    def titleized_slug
-      self.slug.split('-').select {|w| w.capitalize! || w }.join(' ')
+      slug.split('-').select {|w| w.capitalize! || w }.join(' ')
    end

    # Public: the path to the post relative to the site source,
@@ -127,12 +130,12 @@ module Jekyll
    #
    # Returns the path to the file relative to the site source
    def path
-      self.data.fetch('path', self.relative_path.sub(/\A\//, ''))
+      data.fetch('path', relative_path.sub(/\A\//, ''))
    end

    # The path to the post source file, relative to the site source
    def relative_path
-      File.join(@dir, '_posts', @name)
+      File.join(*[@dir, "_posts", @name].map(&:to_s).reject(&:empty?))
    end

    # Compares Post objects. First compares the Post date. If the dates are
@@ -160,7 +163,10 @@ module Jekyll
      self.slug = slug
      self.ext = ext
    rescue ArgumentError
-      raise FatalException.new("Post #{name} does not have a valid date.")
+      path = File.join(@dir || "", name)
+      msg  =  "Post '#{path}' does not have a valid date.\n"
+      msg  << "Fix the date, or exclude the file or directory from being processed"
+      raise FatalException.new(msg)
    end

    # The generated directory into which the post will be placed
@@ -178,11 +184,11 @@ module Jekyll
    #
    # Returns the String permalink.
    def permalink
-      self.data && self.data['permalink']
+      data && data['permalink']
    end

    def template
-      case self.site.permalink_style
+      case site.permalink_style
      when :pretty
        "/:categories/:year/:month/:day/:title/"
      when :none
@@ -192,7 +198,7 @@ module Jekyll
      when :ordinal
        "/:categories/:year/:y_day/:title.html"
      else
-        self.site.permalink_style.to_s
+        site.permalink_style.to_s
      end
    end

@@ -214,13 +220,14 @@ module Jekyll
        :year        => date.strftime("%Y"),
        :month       => date.strftime("%m"),
        :day         => date.strftime("%d"),
-        :title       => CGI.escape(slug),
+        :title       => slug,
        :i_day       => date.strftime("%d").to_i.to_s,
        :i_month     => date.strftime("%m").to_i.to_s,
-        :categories  => (categories || []).map { |c| URI.escape(c.to_s) }.join('/'),
+        :categories  => (categories || []).map { |c| c.to_s }.join('/'),
        :short_month => date.strftime("%b"),
+        :short_year  => date.strftime("%y"),
        :y_day       => date.strftime("%j"),
-        :output_ext  => self.output_ext
+        :output_ext  => output_ext
      }
    end

@@ -229,7 +236,7 @@ module Jekyll
    #
    # Returns the String UID.
    def id
-      File.join(self.dir, self.slug)
+      File.join(dir, slug)
    end

    # Calculate related posts.
@@ -247,16 +254,16 @@ module Jekyll
    # Returns nothing.
    def render(layouts, site_payload)
      # construct payload
-      payload = {
+      payload = Utils.deep_merge_hashes({
        "site" => { "related_posts" => related_posts(site_payload["site"]["posts"]) },
-        "page" => self.to_liquid(EXCERPT_ATTRIBUTES_FOR_LIQUID)
-      }.deep_merge(site_payload)
+        "page" => to_liquid(EXCERPT_ATTRIBUTES_FOR_LIQUID)
+      }, site_payload)

      if generate_excerpt?
-        self.extracted_excerpt.do_layout(payload, {})
+        extracted_excerpt.do_layout(payload, {})
      end

-      do_layout(payload.merge({"page" => self.to_liquid}), layouts)
+      do_layout(payload.merge({"page" => to_liquid}), layouts)
    end

    # Obtain destination path.
@@ -266,30 +273,29 @@ module Jekyll
    # Returns destination file path String.
    def destination(dest)
      # The url needs to be unescaped in order to preserve the correct filename
-      path = File.join(dest, CGI.unescape(self.url))
+      path = Jekyll.sanitized_path(dest, URL.unescape_path(url))
      path = File.join(path, "index.html") if path[/\.html$/].nil?
      path
    end

    # Returns the shorthand String identifier of this Post.
    def inspect
-      "<Post: #{self.id}>"
+      "<Post: #{id}>"
    end

    def next
-      pos = self.site.posts.index(self)
-
-      if pos && pos < self.site.posts.length-1
-        self.site.posts[pos+1]
+      pos = site.posts.index {|post| post.equal?(self) }
+      if pos && pos < site.posts.length - 1
+        site.posts[pos + 1]
      else
        nil
      end
    end

    def previous
-      pos = self.site.posts.index(self)
+      pos = site.posts.index {|post| post.equal?(self) }
      if pos && pos > 0
-        self.site.posts[pos-1]
+        site.posts[pos - 1]
      else
        nil
      end
--- a/lib/jekyll/publisher.rb
+++ b/lib/jekyll/publisher.rb
@@ -0,0 +1,21 @@
+module Jekyll
+  class Publisher
+    def initialize(site)
+      @site = site
+    end
+
+    def publish?(thing)
+      can_be_published?(thing) && !hidden_in_the_future?(thing)
+    end
+
+    private
+
+    def can_be_published?(thing)
+      thing.data.fetch('published', true) || @site.unpublished
+    end
+
+    def hidden_in_the_future?(thing)
+      thing.is_a?(Post) && !@site.future && thing.date > @site.time
+    end
+  end
+end
--- a/lib/jekyll/related_posts.rb
+++ b/lib/jekyll/related_posts.rb
@@ -14,9 +14,9 @@ module Jekyll
    end

    def build
-      return [] unless self.site.posts.size > 1
+      return [] unless site.posts.size > 1

-      if self.site.lsi
+      if site.lsi
        build_index
        lsi_related_posts
      else
@@ -30,7 +30,7 @@ module Jekyll
        lsi = Classifier::LSI.new(:auto_rebuild => false)
        display("Populating LSI...")

-        self.site.posts.each do |x|
+        site.posts.each do |x|
          lsi.add_item(x)
        end

@@ -42,11 +42,11 @@ module Jekyll
    end

    def lsi_related_posts
-      self.class.lsi.find_related(post.content, 11) - [self.post]
+      self.class.lsi.find_related(post.content, 11) - [post]
    end

    def most_recent_posts
-      recent_posts = self.site.posts.reverse - [self.post]
+      recent_posts = site.posts.reverse - [post]
      recent_posts.first(10)
    end

--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -0,0 +1,132 @@
+module Jekyll
+  class Renderer
+
+    attr_reader :document, :site
+
+    def initialize(site, document)
+      @site     = site
+      @document = document
+    end
+
+    # Determine which converters to use based on this document's
+    # extension.
+    #
+    # Returns an array of Converter instances.
+    def converters
+      @converters ||= site.converters.select { |c| c.matches(document.extname) }
+    end
+
+    # Determine the extname the outputted file should have
+    #
+    # Returns the output extname including the leading period.
+    def output_ext
+      converters.first.output_ext(document.extname)
+    end
+
+    ######################
+    ## DAT RENDER THO
+    ######################
+
+    def run
+      payload = Utils.deep_merge_hashes({
+        "page" => document.to_liquid
+      }, site.site_payload)
+
+      info = {
+        filters:   [Jekyll::Filters],
+        registers: { :site => site, :page => payload['page'] }
+      }
+
+      # render and transform content (this becomes the final content of the object)
+      payload["highlighter_prefix"] = converters.first.highlighter_prefix
+      payload["highlighter_suffix"] = converters.first.highlighter_suffix
+
+      output = document.content
+
+      if document.render_with_liquid?
+        output = render_liquid(output, payload, info)
+      end
+
+      place_in_layouts(
+        convert(output),
+        payload,
+        info
+      )
+    end
+
+    # Convert the given content using the converters which match this renderer's document.
+    #
+    # content - the raw, unconverted content
+    #
+    # Returns the converted content.
+    def convert(content)
+      converters.reduce(content) do |output, converter|
+        begin
+          converter.convert output
+        rescue => e
+          Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error converting '#{document.relative_path}'."
+          raise e
+        end
+      end
+    end
+
+    # Render the given content with the payload and info
+    #
+    # content -
+    # payload -
+    # info    -
+    # path    - (optional) the path to the file, for use in ex
+    #
+    # Returns the content, rendered by Liquid.
+    def render_liquid(content, payload, info, path = nil)
+      Liquid::Template.parse(content).render!(payload, info)
+    rescue Tags::IncludeTagError => e
+      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || document.relative_path}"
+      raise e
+    rescue Exception => e
+      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || document.relative_path}"
+      raise e
+    end
+
+    # Render layouts and place given content inside.
+    #
+    # content - the content to be placed in the layout
+    #
+    #
+    # Returns the content placed in the Liquid-rendered layouts
+    def place_in_layouts(content, payload, info)
+      output = content.dup
+      layout = site.layouts[document.data["layout"]]
+      used   = Set.new([layout])
+
+      while layout
+        payload = Utils.deep_merge_hashes(
+          payload,
+          {
+            "content" => output,
+            "page"    => document.to_liquid,
+            "layout"  => layout.data
+          }
+        )
+
+        output = render_liquid(
+          layout.content,
+          payload,
+          info,
+          File.join(site.config['layouts'], layout.name)
+        )
+
+        if layout = site.layouts[layout.data["layout"]]
+          if used.include?(layout)
+            layout = nil # avoid recursive chain
+          else
+            used << layout
+          end
+        end
+      end
+
+      output
+    end
+
+  end
+end
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -1,9 +1,10 @@
 module Jekyll
  class Site
    attr_accessor :config, :layouts, :posts, :pages, :static_files,
-                  :categories, :exclude, :include, :source, :dest, :lsi, :pygments,
-                  :permalink_style, :tags, :time, :future, :safe, :plugins, :limit_posts,
-                  :show_drafts, :keep_files, :baseurl, :data, :file_read_opts, :gems
+                  :exclude, :include, :source, :dest, :lsi, :highlighter,
+                  :permalink_style, :time, :future, :unpublished, :safe, :plugins, :limit_posts,
+                  :show_drafts, :keep_files, :baseurl, :data, :file_read_opts, :gems,
+                  :plugin_manager

    attr_accessor :converters, :generators

@@ -11,54 +12,52 @@ module Jekyll
    #
    # config - A Hash containing site configuration details.
    def initialize(config)
-      self.config          = config.clone
+      self.config = config.clone

-      %w[safe lsi pygments baseurl exclude include future show_drafts limit_posts keep_files gems].each do |opt|
+      %w[safe lsi highlighter baseurl exclude include future unpublished
+        show_drafts limit_posts keep_files gems].each do |opt|
        self.send("#{opt}=", config[opt])
      end

      self.source          = File.expand_path(config['source'])
      self.dest            = File.expand_path(config['destination'])
-      self.plugins         = plugins_path
      self.permalink_style = config['permalink'].to_sym

+      self.plugin_manager = Jekyll::PluginManager.new(self)
+      self.plugins        = plugin_manager.plugins_path
+
      self.file_read_opts = {}
      self.file_read_opts[:encoding] = config['encoding'] if config['encoding']

-      self.reset
-      self.setup
+      reset
+      setup
    end

    # Public: Read, process, and write this Site to output.
    #
    # Returns nothing.
    def process
-      self.reset
-      self.read
-      self.generate
-      self.render
-      self.cleanup
-      self.write
+      reset
+      read
+      generate
+      render
+      cleanup
+      write
    end

    # Reset Site details.
    #
    # Returns nothing
    def reset
-      self.time            = if self.config['time']
-                               Time.parse(self.config['time'].to_s)
-                             else
-                               Time.now
-                             end
-      self.layouts         = {}
-      self.posts           = []
-      self.pages           = []
-      self.static_files    = []
-      self.categories      = Hash.new { |hash, key| hash[key] = [] }
-      self.tags            = Hash.new { |hash, key| hash[key] = [] }
-      self.data            = {}
+      self.time = (config['time'] ? Time.parse(config['time'].to_s) : Time.now)
+      self.layouts = {}
+      self.posts = []
+      self.pages = []
+      self.static_files = []
+      self.data = {}
+      @collections = nil

-      if self.limit_posts < 0
+      if limit_posts < 0
        raise ArgumentError, "limit_posts must be a non-negative number"
      end
    end
@@ -69,18 +68,7 @@ module Jekyll
    def setup
      ensure_not_in_dest

-      # If safe mode is off, load in any Ruby files under the plugins
-      # directory.
-      unless self.safe
-        self.plugins.each do |plugins|
-            Dir[File.join(plugins, "**/*.rb")].sort.each do |f|
-              require f
-            end
-        end
-        self.gems.each do |gem|
-          require gem
-        end
-      end
+      plugin_manager.conscientious_require

      self.converters = instantiate_subclasses(Jekyll::Converter)
      self.generators = instantiate_subclasses(Jekyll::Generator)
@@ -89,22 +77,37 @@ module Jekyll
    # Check that the destination dir isn't the source dir or a directory
    # parent to the source dir.
    def ensure_not_in_dest
-      dest = Pathname.new(self.dest)
-      Pathname.new(self.source).ascend do |path|
-        if path == dest
+      dest_pathname = Pathname.new(dest)
+      Pathname.new(source).ascend do |path|
+        if path == dest_pathname
          raise FatalException.new "Destination directory cannot be or contain the Source directory."
        end
      end
    end

-    # Internal: Setup the plugin search path
+    # The list of collections and their corresponding Jekyll::Collection instances.
+    # If config['collections'] is set, a new instance is created for each item in the collection.
+    # If config['collections'] is not set, a new hash is returned.
    #
-    # Returns an Array of plugin search paths
-    def plugins_path
-      if (config['plugins'] == Jekyll::Configuration::DEFAULTS['plugins'])
-        [File.join(self.source, config['plugins'])]
+    # Returns a Hash containing collection name-to-instance pairs.
+    def collections
+      @collections ||= Hash[collection_names.map { |coll| [coll, Jekyll::Collection.new(self, coll)] } ]
+    end
+
+    # The list of collection names.
+    #
+    # Returns an array of collection names from the configuration,
+    #   or an empty array if the `collections` key is not set.
+    def collection_names
+      case config['collections']
+      when Hash
+        config['collections'].keys
+      when Array
+        config['collections']
+      when nil
+        []
      else
-        Array(config['plugins']).map { |d| File.expand_path(d) }
+        raise ArgumentError, "Your `collections` key must be a hash or an array."
      end
    end

@@ -112,25 +115,10 @@ module Jekyll
    #
    # Returns nothing.
    def read
-      self.read_layouts
-      self.read_directories
-      self.read_data(config['data_source'])
-    end
-
-    # 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, self.config['layouts'])
-      return unless File.exists?(base)
-      entries = []
-      Dir.chdir(base) { entries = filter_entries(Dir['**/*.*']) }
-
-      entries.each do |f|
-        name = f.split(".")[0..-2].join(".")
-        self.layouts[name] = Layout.new(self, base, f)
-      end
+      self.layouts = LayoutReader.new(self).read
+      read_directories
+      read_data(config['data_source'])
+      read_collections
    end

    # Recursively traverse directories to find posts, pages and static files
@@ -141,25 +129,28 @@ module Jekyll
    #
    # Returns nothing.
    def read_directories(dir = '')
-      base = File.join(self.source, dir)
-      entries = Dir.chdir(base) { filter_entries(Dir.entries('.')) }
+      base = File.join(source, dir)
+      entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }

-      self.read_posts(dir)
-      self.read_drafts(dir) if self.show_drafts
-      self.posts.sort!
+      read_posts(dir)
+      read_drafts(dir) if show_drafts
+      posts.sort!
      limit_posts! if limit_posts > 0 # limit the posts if :limit_posts option is set

      entries.each do |f|
        f_abs = File.join(base, f)
        if File.directory?(f_abs)
          f_rel = File.join(dir, f)
-          read_directories(f_rel) unless self.dest.sub(/\/$/, '') == f_abs
+          read_directories(f_rel) unless dest.sub(/\/$/, '') == f_abs
        elsif has_yaml_header?(f_abs)
-          pages << Page.new(self, self.source, dir, f)
+          page = Page.new(self, source, dir, f)
+          pages << page if publisher.publish?(page)
        else
-          static_files << StaticFile.new(self, self.source, dir, f)
+          static_files << StaticFile.new(self, source, dir, f)
        end
      end
+
+      pages.sort_by!(&:name)
    end

    # Read all the files in <source>/<dir>/_posts and create a new Post
@@ -169,14 +160,12 @@ module Jekyll
    #
    # Returns nothing.
    def read_posts(dir)
-      posts = read_things(dir, '_posts', Post)
+      posts = read_content(dir, '_posts', Post)

      posts.each do |post|
-        if post.published && (self.future || post.date <= self.time)
-          aggregate_post_info(post)
-        end
+        aggregate_post_info(post) if publisher.publish?(post)
      end
-   end
+    end

    # Read all the files in <source>/<dir>/_drafts and create a new Post
    # object with each one.
@@ -185,16 +174,20 @@ module Jekyll
    #
    # Returns nothing.
    def read_drafts(dir)
-      drafts = read_things(dir, '_drafts', Draft)
+      drafts = read_content(dir, '_drafts', Draft)

      drafts.each do |draft|
-        aggregate_post_info(draft)
+        if draft.published?
+          aggregate_post_info(draft)
+        end
      end
    end

-    def read_things(dir, magic_dir, klass)
-      things = get_entries(dir, magic_dir).map do |entry|
-        klass.new(self, self.source, dir, entry) if klass.valid?(entry)
+    def read_content(dir, magic_dir, klass)
+      get_entries(dir, magic_dir).map do |entry|
+        klass.new(self, source, dir, entry) if klass.valid?(entry)
+      end.reject do |entry|
+        entry.nil?
      end
    end

@@ -202,18 +195,27 @@ module Jekyll
    #
    # Returns nothing
    def read_data(dir)
-      base = File.join(self.source, dir)
-      return unless File.directory?(base) && (!self.safe || !File.symlink?(base))
+      base = File.join(source, dir)
+      return unless File.directory?(base) && (!safe || !File.symlink?(base))

      entries = Dir.chdir(base) { Dir['*.{yaml,yml}'] }
      entries.delete_if { |e| File.directory?(File.join(base, e)) }

      entries.each do |entry|
-        path = File.join(self.source, dir, entry)
-        next if File.symlink?(path) && self.safe
+        path = File.join(source, dir, entry)
+        next if File.symlink?(path) && safe

        key = sanitize_filename(File.basename(entry, '.*'))
-        self.data[key] = YAML.safe_load_file(path)
+        self.data[key] = SafeYAML.load_file(path)
+      end
+    end
+
+    # Read in all collections specified in the configuration
+    #
+    # Returns nothing.
+    def read_collections
+      collections.each do |_, collection|
+        collection.read unless collection.label.eql?("data")
      end
    end

@@ -221,7 +223,7 @@ module Jekyll
    #
    # Returns nothing.
    def generate
-      self.generators.each do |generator|
+      generators.each do |generator|
        generator.generate(self)
      end
    end
@@ -232,13 +234,16 @@ module Jekyll
    def render
      relative_permalinks_deprecation_method

-      payload = site_payload
-      [self.posts, self.pages].flatten.each do |page_or_post|
-        page_or_post.render(self.layouts, payload)
+      collections.each do |label, collection|
+        collection.docs.each do |document|
+          document.output = Jekyll::Renderer.new(self, document).run
+        end
      end

-      self.categories.values.map { |ps| ps.sort! { |a, b| b <=> a } }
-      self.tags.values.map { |ps| ps.sort! { |a, b| b <=> a } }
+      payload = site_payload
+      [posts, pages].flatten.each do |page_or_post|
+        page_or_post.render(layouts, payload)
+      end
    rescue Errno::ENOENT => e
      # ignore missing layout dir
    end
@@ -254,7 +259,7 @@ module Jekyll
    #
    # Returns nothing.
    def write
-      each_site_file { |item| item.write(self.dest) }
+      each_site_file { |item| item.write(dest) }
    end

    # Construct a Hash of Posts indexed by the specified Post attribute.
@@ -273,18 +278,26 @@ module Jekyll
    def post_attr_hash(post_attr)
      # Build a hash map based on the specified post attribute ( post attr =>
      # array of posts ) then sort each array in reverse order.
-      hash = Hash.new { |hsh, key| hsh[key] = Array.new }
-      self.posts.each { |p| p.send(post_attr.to_sym).each { |t| hash[t] << p } }
-      hash.values.map { |sortme| sortme.sort! { |a, b| b <=> a } }
+      hash = Hash.new { |h, key| h[key] = [] }
+      posts.each { |p| p.send(post_attr.to_sym).each { |t| hash[t] << p } }
+      hash.values.each { |posts| posts.sort!.reverse! }
      hash
    end

+    def tags
+      post_attr_hash('tags')
+    end
+
+    def categories
+      post_attr_hash('categories')
+    end
+
    # Prepare site data for site payload. The method maintains backward compatibility
    # if the key 'data' is already used in _config.yml.
    #
    # Returns the Hash to be hooked to site.data.
    def site_data
-      self.config['data'] || self.data
+      config['data'] || data
    end

    # The Hash payload containing site-wide data.
@@ -302,14 +315,20 @@ module Jekyll
    #                  See Site#post_attr_hash for type info.
    def site_payload
      {"jekyll" => { "version" => Jekyll::VERSION },
-       "site" => self.config.merge({
-          "time"       => self.time,
-          "posts"      => self.posts.sort { |a, b| b <=> a },
-          "pages"      => self.pages,
-          "html_pages" => self.pages.reject { |page| !page.html? },
-          "categories" => post_attr_hash('categories'),
-          "tags"       => post_attr_hash('tags'),
-          "data"       => site_data})}
+       "site"   => Utils.deep_merge_hashes(config,
+         Utils.deep_merge_hashes(Hash[collections.map{|label, coll| [label, coll.docs]}], {
+          "time"         => time,
+          "posts"        => posts.sort { |a, b| b <=> a },
+          "pages"        => pages,
+          "static_files" => static_files.sort { |a, b| a.relative_path <=> b.relative_path },
+          "html_pages"   => pages.reject { |page| !page.html? },
+          "categories"   => post_attr_hash('categories'),
+          "tags"         => post_attr_hash('tags'),
+          "collections"  => collections,
+          "documents"    => documents,
+          "data"         => site_data
+        }))
+      }
    end

    # Filter out any files/directories that are hidden or backup files (start
@@ -320,8 +339,8 @@ module Jekyll
    # entries - The Array of String file/directory entries to filter.
    #
    # Returns the Array of filtered entries.
-    def filter_entries(entries)
-      EntryFilter.new(self).filter(entries)
+    def filter_entries(entries, base_directory = nil)
+      EntryFilter.new(self, base_directory).filter(entries)
    end

    # Get the implementation class for the given Converter.
@@ -330,7 +349,7 @@ module Jekyll
    #
    # Returns the Converter instance implementing the given Converter.
    def getConverterImpl(klass)
-      matches = self.converters.select { |c| c.class == klass }
+      matches = converters.select { |c| c.class == klass }
      if impl = matches.first
        impl
      else
@@ -347,9 +366,9 @@ module Jekyll
    # Returns array of instances of subclasses of parameter
    def instantiate_subclasses(klass)
      klass.subclasses.select do |c|
-        !self.safe || c.safe
+        !safe || c.safe
      end.sort.map do |c|
-        c.new(self.config)
+        c.new(config)
      end
    end

@@ -360,9 +379,9 @@ module Jekyll
    #
    # Returns the list of entries to process
    def get_entries(dir, subfolder)
-      base = File.join(self.source, dir, subfolder)
-      return [] unless File.exists?(base)
-      entries = Dir.chdir(base) { filter_entries(Dir['**/*']) }
+      base = File.join(source, dir, subfolder)
+      return [] unless File.exist?(base)
+      entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
      entries.delete_if { |e| File.directory?(File.join(base, e)) }
    end

@@ -372,44 +391,54 @@ module Jekyll
    #
    # Returns nothing
    def aggregate_post_info(post)
-      self.posts << post
-      post.categories.each { |c| self.categories[c] << post }
-      post.tags.each { |c| self.tags[c] << post }
+      posts << post
    end

    def relative_permalinks_deprecation_method
      if config['relative_permalinks'] && has_relative_page?
-        $stderr.puts # Places newline after "Generating..."
        Jekyll.logger.warn "Deprecation:", "Starting in 2.0, permalinks for pages" +
                                            " in subfolders must be relative to the" +
                                            " site source directory, not the parent" +
                                            " directory. Check http://jekyllrb.com/docs/upgrading/"+
                                            " for more info."
-        $stderr.print Jekyll.logger.formatted_topic("") + "..." # for "done."
      end
    end

+    def docs_to_write
+      documents.select(&:write?)
+    end
+
+    def documents
+      collections.reduce(Set.new) do |docs, (_, collection)|
+        docs.merge(collection.docs)
+      end.to_a
+    end
+
    def each_site_file
-      %w(posts pages static_files).each do |type|
-        self.send(type).each do |item|
+      %w(posts pages static_files docs_to_write).each do |type|
+        send(type).each do |item|
          yield item
        end
      end
    end

+    def frontmatter_defaults
+      @frontmatter_defaults ||= Configuration::FrontmatterDefaults.new(self)
+    end
+
    private

    def has_relative_page?
-      self.pages.any? { |page| page.uses_relative_permalinks }
+      pages.any? { |page| page.uses_relative_permalinks }
    end

    def has_yaml_header?(file)
-      "---" == File.open(file) { |fd| fd.read(3) }
+      !!(File.open(file, 'rb') { |f| f.read(5) } =~ /\A---\r?\n/)
    end

    def limit_posts!
-      limit = self.posts.length < limit_posts ? self.posts.length : limit_posts
-      self.posts = self.posts[-limit, limit]
+      limit = posts.length < limit_posts ? posts.length : limit_posts
+      self.posts = posts[-limit, limit]
    end

    def site_cleaner
@@ -417,9 +446,13 @@ module Jekyll
    end

    def sanitize_filename(name)
-      name = name.gsub(/[^\w\s_-]+/, '')
-      name = name.gsub(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-      name = name.gsub(/\s+/, '_')
+      name.gsub!(/[^\w\s_-]+/, '')
+      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
+      name.gsub(/\s+/, '_')
+    end
+
+    def publisher
+      @publisher ||= Publisher.new(self)
    end
  end
 end
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -21,6 +21,11 @@ module Jekyll
      File.join(@base, @dir, @name)
    end

+    # Returns the source file path relative to the site source
+    def relative_path
+      @relative_path ||= path.sub(/\A#{@site.source}/, '')
+    end
+
    # Obtain destination path.
    #
    # dest - The String path to the destination dir.
@@ -66,5 +71,13 @@ module Jekyll
      @@mtimes = Hash.new
      nil
    end
+
+    def to_liquid
+      {
+        "path"          => relative_path,
+        "modified_time" => mtime.to_s,
+        "extname"       => File.extname(relative_path)
+      }
+    end
  end
 end
--- a/lib/jekyll/stevenson.rb
+++ b/lib/jekyll/stevenson.rb
@@ -2,20 +2,22 @@ module Jekyll
  class Stevenson
    attr_accessor :log_level

-    DEBUG  = 0
-    INFO   = 1
-    WARN   = 2
-    ERROR  = 3
+    LOG_LEVELS = {
+      debug: 0,
+      info:  1,
+      warn:  2,
+      error: 3
+    }

    # Public: Create a new instance of Stevenson, Jekyll's logger
    #
-    # level - (optional, integer) the log level
+    # level - (optional, symbol) the log level
    #
    # Returns nothing
-    def initialize(level = INFO)
+    def initialize(level = :info)
      @log_level = level
    end
-    
+
    # Public: Print a jekyll debug message to stdout
    #
    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
@@ -23,7 +25,7 @@ module Jekyll
    #
    # Returns nothing
    def debug(topic, message = nil)
-      $stdout.puts(message(topic, message)) if log_level <= DEBUG
+      $stdout.puts(message(topic, message)) if should_log(:debug)
    end

    # Public: Print a jekyll message to stdout
@@ -33,7 +35,7 @@ module Jekyll
    #
    # Returns nothing
    def info(topic, message = nil)
-      $stdout.puts(message(topic, message)) if log_level <= INFO
+      $stdout.puts(message(topic, message)) if should_log(:info)
    end

    # Public: Print a jekyll message to stderr
@@ -43,7 +45,7 @@ module Jekyll
    #
    # Returns nothing
    def warn(topic, message = nil)
-      $stderr.puts(message(topic, message).yellow) if log_level <= WARN
+      $stderr.puts(message(topic, message).yellow) if should_log(:warn)
    end

    # Public: Print a jekyll error message to stderr
@@ -53,7 +55,7 @@ module Jekyll
    #
    # Returns nothing
    def error(topic, message = nil)
-      $stderr.puts(message(topic, message).red) if log_level <= ERROR
+      $stderr.puts(message(topic, message).red) if should_log(:error)
    end

    # Public: Print a Jekyll error message to stderr and immediately abort the process
@@ -85,5 +87,16 @@ module Jekyll
    def formatted_topic(topic)
      "#{topic} ".rjust(20)
    end
+
+    # Public: Determine whether the current log level warrants logging at the
+    #         proposed level.
+    #
+    # level_of_message - the log level of the message (symbol)
+    #
+    # Returns true if the log level of the message is greater than or equal to
+    #   this logger's log level.
+    def should_log(level_of_message)
+      LOG_LEVELS.fetch(log_level) <= LOG_LEVELS.fetch(level_of_message)
+    end
  end
 end
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -5,10 +5,7 @@ module Jekyll

      # The regular expression syntax checker. Start with the language specifier.
      # Follow that by zero or more space separated options that take one of two
-      # forms:
-      #
-      # 1. name
-      # 2. name=value
+      # forms: name or name=value
      SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=\w+)?)*)$/

      def initialize(tag_name, markup, tokens)
@@ -19,16 +16,10 @@ module Jekyll
          if defined?($2) && $2 != ''
            $2.split.each do |opt|
              key, value = opt.split('=')
-              if value.nil?
-                if key == 'linenos'
-                  value = 'inline'
-                else
-                  value = true
-                end
-              end
-              @options[key] = value
+              @options[key.to_sym] = value || true
            end
          end
+          @options[:linenos] = "inline" if @options.key?(:linenos) and @options[:linenos] == true
        else
          raise SyntaxError.new <<-eos
 Syntax Error in tag 'highlight' while parsing the following markup:
@@ -41,41 +32,60 @@ eos
      end

      def render(context)
-        if context.registers[:site].pygments
-          render_pygments(context, super)
+        prefix = context["highlighter_prefix"] || ""
+        suffix = context["highlighter_suffix"] || ""
+        code = super.to_s.strip
+
+        output = case context.registers[:site].highlighter
+        when 'pygments'
+          render_pygments(code)
+        when 'rouge'
+          render_rouge(code)
        else
-          render_codehighlighter(context, super)
+          render_codehighlighter(code)
        end
+
+        rendered_output = add_code_tag(output)
+        prefix + rendered_output + suffix
      end

-      def render_pygments(context, code)
+      def render_pygments(code)
        require 'pygments'
-
        @options[:encoding] = 'utf-8'

-        output = add_code_tags(
-          Pygments.highlight(code, :lexer => @lang, :options => @options),
-          @lang
-        )
+        highlighted_code = Pygments.highlight(code, :lexer => @lang, :options => @options)

-        output = context["pygments_prefix"] + output if context["pygments_prefix"]
-        output = output + context["pygments_suffix"] if context["pygments_suffix"]
-        output
+        if highlighted_code.nil?
+          Jekyll.logger.error "There was an error highlighting your code:"
+          puts
+          Jekyll.logger.error code
+          puts
+          Jekyll.logger.error "While attempting to convert the above code, Pygments.rb" +
+            " returned an unacceptable value."
+          Jekyll.logger.error "This is usually a timeout problem solved by running `jekyll build` again."
+          raise ArgumentError.new("Pygments.rb returned an unacceptable value when attempting to highlight some code.")
+        end
+
+        highlighted_code
      end

-      def render_codehighlighter(context, code)
-        #The div is required because RDiscount blows ass
-        <<-HTML
-  <div>
-    <pre><code class='#{@lang}'>#{h(code).strip}</code></pre>
-  </div>
-        HTML
+      def render_rouge(code)
+        require 'rouge'
+        formatter = Rouge::Formatters::HTML.new(line_numbers: @options[:linenos], wrap: false)
+        lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
+        code = formatter.format(lexer.lex(code))
+        "<div class=\"highlight\"><pre>#{code}</pre></div>"
      end

-      def add_code_tags(code, lang)
+      def render_codehighlighter(code)
+        "<div class=\"highlight\"><pre>#{h(code).strip}</pre></div>"
+      end
+
+      def add_code_tag(code)
        # Add nested <code> tags to code blocks
-        code = code.sub(/<pre>/,'<pre><code class="' + lang + '">')
-        code = code.sub(/<\/pre>/,"</code></pre>")
+        code = code.sub(/<pre>\n*/,'<pre><code class="' + @lang.to_s.gsub("+", "-") + '">')
+        code = code.sub(/\n*<\/pre>/,"</code></pre>")
+        code.strip
      end

    end
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -14,12 +14,19 @@ module Jekyll
      SYNTAX_EXAMPLE = "{% include file.ext param='value' param2='value' %}"

      VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
+      VARIABLE_SYNTAX = /(?<variable>\{\{\s*(?<name>[\w\-\.]+)\s*(\|.*)?\}\})(?<params>.*)/

      INCLUDES_DIR = '_includes'

      def initialize(tag_name, markup, tokens)
        super
-        @file, @params = markup.strip.split(' ', 2);
+        matched = markup.strip.match(VARIABLE_SYNTAX)
+        if matched
+          @file = matched['variable'].strip
+          @params = matched['params'].strip
+        else
+          @file, @params = markup.strip.split(' ', 2);
+        end
        validate_params if @params
      end

@@ -48,11 +55,11 @@ module Jekyll
            raise ArgumentError.new <<-eos
 Invalid syntax for include tag. File contains invalid characters or sequences:

-	#{@file}
+  #{file}

 Valid syntax:

-	#{SYNTAX_EXAMPLE}
+  #{SYNTAX_EXAMPLE}

 eos
        end
@@ -64,11 +71,11 @@ eos
          raise ArgumentError.new <<-eos
 Invalid syntax for include tag:

-	#{@params}
+  #{@params}

 Valid syntax:

-	#{SYNTAX_EXAMPLE}
+  #{SYNTAX_EXAMPLE}

 eos
        end
@@ -79,22 +86,22 @@ eos
        context.registers[:site].file_read_opts
      end

-      def retrieve_variable(context)
-        if /\{\{([\w\-\.]+)\}\}/ =~ @file
-          raise ArgumentError.new("No variable #{$1} was found in include tag") if context[$1].nil?
-          context[$1]
+      # Render the variable if required
+      def render_variable(context)
+        if @file.match(VARIABLE_SYNTAX)
+          partial = Liquid::Template.parse(@file)
+          partial.render!(context)
        end
      end

      def render(context)
-        dir = File.join(context.registers[:site].source, INCLUDES_DIR)
-        validate_dir(dir, context.registers[:site].safe)
+        dir = File.join(File.realpath(context.registers[:site].source), INCLUDES_DIR)

-        file = retrieve_variable(context) || @file
+        file = render_variable(context) || @file
        validate_file_name(file)

        path = File.join(dir, file)
-        validate_file(path, context.registers[:site].safe)
+        validate_path(path, dir, context.registers[:site].safe)

        begin
          partial = Liquid::Template.parse(source(path, context))
@@ -108,18 +115,20 @@ eos
        end
      end

-      def validate_dir(dir, safe)
-        if File.symlink?(dir) && safe
-          raise IOError.new "Includes directory '#{dir}' cannot be a symlink"
+      def validate_path(path, dir, safe)
+        if safe && !realpath_prefixed_with?(path, dir)
+          raise IOError.new "The included file '#{path}' should exist and should not be a symlink"
+        elsif !File.exist?(path)
+          raise IOError.new "Included file '#{path_relative_to_source(dir, path)}' not found"
        end
      end

-      def validate_file(file, safe)
-        if !File.exists?(file)
-          raise IOError.new "Included file '#{@file}' not found in '#{INCLUDES_DIR}' directory"
-        elsif File.symlink?(file) && safe
-          raise IOError.new "The included file '#{INCLUDES_DIR}/#{@file}' should not be a symlink"
-        end
+      def path_relative_to_source(dir, path)
+        File.join(INCLUDES_DIR, path.sub(Regexp.new("^#{dir}"), ""))
+      end
+
+      def realpath_prefixed_with?(path, dir)
+        File.exist?(path) && File.realpath(path).start_with?(dir)
      end

      def blank?
@@ -128,7 +137,7 @@ eos

      # This method allows to modify the file content by inheriting from the class.
      def source(file, context)
-        File.read_with_options(file, file_read_opts(context))
+        File.read(file, file_read_opts(context))
      end
    end
  end
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -7,6 +7,7 @@ module Jekyll

      def initialize(name)
        all, path, date, slug = *name.sub(/^\//, "").match(MATCHER)
+        raise ArgumentError.new("'#{name}' does not contain valid date and/or title") unless all
        @slug = path ? path + slug : slug
        @date = Time.parse(date)
      end
@@ -38,7 +39,15 @@ module Jekyll
      def initialize(tag_name, post, tokens)
        super
        @orig_post = post.strip
-        @post = PostComparer.new(@orig_post)
+        begin
+          @post = PostComparer.new(@orig_post)
+        rescue
+          raise ArgumentError.new <<-eos
+Could not parse name of post "#{@orig_post}" in tag 'post_url'.
+
+Make sure the post exists and the name is correct.
+eos
+        end
      end

      def render(context)
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -1,3 +1,5 @@
+require 'uri'
+
 # Public: Methods that generate a URL for a resource such as a Post or a Page.
 #
 # Examples
@@ -22,9 +24,9 @@ module Jekyll
    #                           template. Instead, the given permalink will be
    #                           used as URL.
    def initialize(options)
-      @template = options[:template]
+      @template     = options[:template]
      @placeholders = options[:placeholders] || {}
-      @permalink = options[:permalink]
+      @permalink    = options[:permalink]

      if (@template || @permalink).nil?
        raise ArgumentError, "One of :template or :permalink must be supplied."
@@ -44,12 +46,13 @@ module Jekyll
    # Returns the _unsanitizied_ String URL
    def generate_url
      @placeholders.inject(@template) do |result, token|
-        result.gsub(/:#{token.first}/, token.last)
+        result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
      end
    end

    # Returns a sanitized String URL
    def sanitize_url(in_url)
+
      # Remove all double slashes
      url = in_url.gsub(/\/\//, "/")

@@ -61,7 +64,46 @@ module Jekyll

      # Always add a leading slash
      url.gsub!(/\A([^\/])/, '/\1')
+
      url
    end
+
+    # Escapes a path to be a valid URL path segment
+    #
+    # path - The path to be escaped.
+    #
+    # Examples:
+    #
+    #   URL.escape_path("/a b")
+    #   # => "/a%20b"
+    #
+    # Returns the escaped path.
+    def self.escape_path(path)
+      # Because URI.escape doesn't escape '?', '[' and ']' by defaut,
+      # specify unsafe string (except unreserved, sub-delims, ":", "@" and "/").
+      #
+      # URI path segment is defined in RFC 3986 as follows:
+      #   segment       = *pchar
+      #   pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+      #   unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+      #   pct-encoded   = "%" HEXDIG HEXDIG
+      #   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+      #                 / "*" / "+" / "," / ";" / "="
+      URI.escape(path, /[^a-zA-Z\d\-._~!$&\'()*+,;=:@\/]/)
+    end
+
+    # Unescapes a URL path segment
+    #
+    # path - The path to be unescaped.
+    #
+    # Examples:
+    #
+    #   URL.unescape_path("/a%20b")
+    #   # => "/a b"
+    #
+    # Returns the unescaped path.
+    def self.unescape_path(path)
+      URI.unescape(path)
+    end
  end
 end
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -0,0 +1,79 @@
+module Jekyll
+  module Utils
+    class << self
+
+      # Merges a master hash with another hash, recursively.
+      #
+      # master_hash - the "parent" hash whose values will be overridden
+      # other_hash  - the other hash whose values will be persisted after the merge
+      #
+      # This code was lovingly stolen from some random gem:
+      # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+      #
+      # Thanks to whoever made it.
+      def deep_merge_hashes(master_hash, other_hash)
+        target = master_hash.dup
+
+        other_hash.keys.each do |key|
+          if other_hash[key].is_a? Hash and target[key].is_a? Hash
+            target[key] = Utils.deep_merge_hashes(target[key], other_hash[key])
+            next
+          end
+
+          target[key] = other_hash[key]
+        end
+
+        target
+      end
+
+      # Read array from the supplied hash favouring the singular key
+      # and then the plural key, and handling any nil entries.
+      #
+      # hash - the hash to read from
+      # singular_key - the singular key
+      # plural_key - the plural key
+      #
+      # Returns an array
+      def pluralized_array_from_hash(hash, singular_key, plural_key)
+        if hash.has_key?(singular_key)
+          array = [hash[singular_key]] if hash[singular_key]
+        elsif hash.has_key?(plural_key)
+          case hash[plural_key]
+          when String
+            array = hash[plural_key].split
+          when Array
+            array = hash[plural_key].compact
+          end
+        end
+        array || []
+      end
+
+      def transform_keys(hash)
+        result = {}
+        hash.each_key do |key|
+          result[yield(key)] = hash[key]
+        end
+        result
+      end
+
+      # Apply #to_sym to all keys in the hash
+      #
+      # hash - the hash to which to apply this transformation
+      #
+      # Returns a new hash with symbolized keys
+      def symbolize_hash_keys(hash)
+        transform_keys(hash) { |key| key.to_sym rescue key }
+      end
+
+      # Apply #to_s to all keys in the Hash
+      #
+      # hash - the hash to which to apply this transformation
+      #
+      # Returns a new hash with stringified keys
+      def stringify_hash_keys(hash)
+        transform_keys(hash) { |key| key.to_s rescue key }
+      end
+
+    end
+  end
+end
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -0,0 +1,3 @@
+module Jekyll
+  VERSION = '2.0.0'
+end
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -1,3 +1,10 @@
-name: Your New Jekyll Site
-markdown: redcarpet
-pygments: true
+# Site settings
+name: Dat site title tho
+title: Your awesome title
+email: your-email@domain.com
+description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
+baseurl: "http://yourdomain.com"
+
+# Build settings
+markdown: kramdown
+permalinks: pretty
--- a/lib/site_template/_includes/footer.html
+++ b/lib/site_template/_includes/footer.html
@@ -0,0 +1,61 @@
+<footer class="site-footer">
+
+  <div class="wrap">
+
+    <h2 class="footer-heading">{{ site.name }}</h2>
+
+    <div class="footer-col-1 column">
+      <ul>
+        <li>{{ site.title }}</li>
+        <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
+      </ul>
+    </div>
+
+    <div class="footer-col-2 column">
+      <ul>
+        <li>
+          <a href="https://github.com/{{ site.username }}">
+            <span class="icon github">
+              <svg version="1.1" class="github-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+                 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+                <path fill-rule="evenodd" clip-rule="evenodd" fill="#C2C2C2" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761
+                c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32
+                c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472
+                c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037
+                C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65
+                c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261
+                c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082
+                c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129
+                c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
+              </svg>
+            </span>
+            <span class="username">{{ site.username }}</span>
+          </a>
+        </li>
+        <li>
+          <a href="https://twitter.com/{{ site.username }}">
+            <span class="icon twitter">
+              <svg version="1.1" class="twitter-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+                 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+                <path fill="#C2C2C2" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
+                c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27
+                c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767
+                c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206
+                C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271
+                c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469
+                c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
+              </svg>
+            </span>
+            <span class="username">{{ site.username }}</span>
+          </a>
+        </li>
+      </ul>
+    </div>
+
+    <div class="footer-col-3 column">
+      <p class="text">{{ site.description }}</p>
+    </div>
+
+  </div>
+
+</footer>
--- a/lib/site_template/_includes/head.html
+++ b/lib/site_template/_includes/head.html
@@ -0,0 +1,12 @@
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>{% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}</title>
+    <meta name="viewport" content="width=device-width">
+    <meta name="description" content="{{ site.description }}">
+    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
+
+    <!-- Custom CSS -->
+    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
+
+</head>
--- a/lib/site_template/_includes/header.html
+++ b/lib/site_template/_includes/header.html
@@ -0,0 +1,28 @@
+<header class="site-header">
+
+  <div class="wrap">
+
+    <a class="site-title" href="{{ site.baseurl }}">{{ site.name }}</a>
+
+    <nav class="site-nav">
+      <a href="#" class="menu-icon">
+        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+           viewBox="0 0 18 15" enable-background="new 0 0 18 15" xml:space="preserve">
+          <path fill="#505050" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0
+            h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
+          <path fill="#505050" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484
+            h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
+          <path fill="#505050" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0
+            c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
+        </svg>
+      </a>
+      <div class="trigger">
+        {% for page in site.pages %}
+          <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
+        {% endfor %}
+      </div>
+    </nav>
+
+  </div>
+
+</header>
--- a/lib/site_template/_layouts/default.html
+++ b/lib/site_template/_layouts/default.html
@@ -1,44 +1,19 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>{{ page.title }}</title>
-        <meta name="viewport" content="width=device-width">

-        <!-- syntax highlighting CSS -->
-        <link rel="stylesheet" href="/css/syntax.css">
+  {% include head.html %}

-        <!-- Custom CSS -->
-        <link rel="stylesheet" href="/css/main.css">
-
-    </head>
    <body>

-        <div class="site">
-          <div class="header">
-            <h1 class="title"><a href="/">{{ site.name }}</a></h1>
-            <a class="extra" href="/">home</a>
-          </div>
+    {% include header.html %}

-          {{ content }}
+    <div class="page-content">
+      <div class="wrap">
+      {{ content }}
+      </div>
+    </div>

-          <div class="footer">
-            <div class="contact">
-              <p>
-                Your Name<br />
-                What You Are<br />
-                you@example.com
-              </p>
-            </div>
-            <div class="contact">
-              <p>
-                <a href="https://github.com/yourusername">github.com/yourusername</a><br />
-                <a href="https://twitter.com/yourusername">twitter.com/yourusername</a><br />
-              </p>
-            </div>
-          </div>
-        </div>
+    {% include footer.html %}

    </body>
-</html>
+</html>
--- a/lib/site_template/_layouts/page.html
+++ b/lib/site_template/_layouts/page.html
@@ -0,0 +1,14 @@
+---
+layout: default
+---
+<div class="post">
+
+  <header class="post-header">
+    <h1>{{ page.title }}</h1>
+  </header>
+
+  <article class="post-content">
+  {{ content }}
+  </article>
+
+</div>
--- a/lib/site_template/_layouts/post.html
+++ b/lib/site_template/_layouts/post.html
@@ -1,9 +1,15 @@
 ---
 layout: default
 ---
-<h2>{{ page.title }}</h2>
-<p class="meta">{{ page.date | date_to_string }}</p>
-
 <div class="post">
-{{ content }}
-</div>
+
+  <header class="post-header">
+    <h1>{{ page.title }}</h1>
+    <p class="meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+  </header>
+
+  <article class="post-content">
+  {{ content }}
+  </article>
+
+</div>
--- a/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
+++ b/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
@@ -20,5 +20,5 @@ print_hi('Tom')

 Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll's GitHub repo][jekyll-gh].

-[jekyll-gh]: https://github.com/mojombo/jekyll
+[jekyll-gh]: https://github.com/jekyll/jekyll
 [jekyll]:    http://jekyllrb.com
--- a/lib/site_template/about.md
+++ b/lib/site_template/about.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: About
+permalink: /about/
+---
+
+This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
+
+You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
+
+You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)
--- a/lib/site_template/css/main.css
+++ b/lib/site_template/css/main.css
@@ -1,10 +1,6 @@
-/*****************************************************************************/
-/*
-/* Common
-/*
-/*****************************************************************************/
+/* Base */
+/* ----------------------------------------------------------*/

-/* Global Reset */
 * {
  margin: 0;
  padding: 0;
@@ -13,148 +9,397 @@
 html, body { height: 100%; }

 body {
-  background-color: #FFF;
-  font: 13.34px Helvetica, Arial, sans-serif;
-  font-size: small;
-  text-align: center;
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 1.5;
+  font-weight: 300;
+  background-color: #fdfdfd;
 }

-h1, h2, h3, h4, h5, h6 {
-  font-size: 100%; }
+h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: 400; }

-h1 { margin-bottom: 1em; }
-p { margin: 1em 0; }
+a         { color: #2a7ae2; text-decoration: none; }
+a:hover   { color: #000; text-decoration: underline; }
+a:visited { color: #205caa; }

-a         { color: #00a; }
-a:hover   { color: #000; }
-a:visited { color: #a0a; }
+/* Utility */

-/*****************************************************************************/
-/*
-/* Home
-/*
-/*****************************************************************************/
-.posts {
-  list-style-type: none;
-  margin-bottom: 2em;
+.wrap:before,
+.wrap:after { content:""; display:table; }
+.wrap:after { clear: both; }
+.wrap {
+  max-width: 800px;
+  padding: 0 30px;
+  margin: 0 auto;
+  zoom: 1;
 }

-.posts li {
-  line-height: 1.75em;
+
+/* Layout Styles */
+/* ----------------------------------------------------------*/
+
+/* Site header */
+
+.site-header {
+  border-top: 5px solid #333;
+  border-bottom: 1px solid #e8e8e8;
+  min-height: 56px;
+  background-color: white;
 }

-.posts span {
-  color: #aaa;
-  font-family: Monaco, "Courier New", monospace;
-  font-size: 80%;
-}
-
-/*****************************************************************************/
-/*
-/* Site
-/*
-/*****************************************************************************/
-
-.site {
-  font-size: 115%;
-  text-align: justify;
-  width: 42em;
-  margin: 3em auto 2em;
-  line-height: 1.5em;
-}
-
-.header a {
-  font-weight: bold;
-  text-decoration: none;
-}
-
-.title {
-  display: inline-block;
-  margin-bottom: 2em;
-}
-
-.title a {
-  color: #a00;
-}
-
-.title a:hover {
-  color: #000;
-}
-
-.header a.extra {
-  color: #aaa;
-  margin-left: 1em;
-}
-
-.header a.extra:hover {
-  color: #000;
-}
-
-.meta {
-  color: #aaa;
-}
-
-.footer {
-  font-size: 80%;
-  color: #666;
-  border-top: 4px solid #eee;
-  margin-top: 2em;
-  overflow: hidden;
-}
-
-.footer .contact {
+.site-title,
+.site-title:hover,
+.site-title:visited {
+  display: block;
+  color: #333;
+  font-size: 26px;
+  letter-spacing: -1px;
  float: left;
-  margin-right: 3em;
+  line-height: 56px;
+  position: relative;
+  z-index: 1;
 }

-.footer .contact a {
-  color: #8085C1;
-}
-
-.footer .rss {
-  margin-top: 1.1em;
-  margin-right: -.2em;
+.site-nav {
  float: right;
+  line-height: 56px;
 }

-.footer .rss img {
-  border: 0;
+.site-nav .menu-icon { display: none; }
+
+.site-nav .page-link {
+  margin-left: 20px;
+  color: #727272;
+  letter-spacing: -.5px;
 }

-/*****************************************************************************/
-/*
-/* Posts
-/*
-/*****************************************************************************/
+/* Site footer */

-/* standard */
-.post pre {
-  border: 1px solid #ddd;
-  background-color: #eef;
-  padding: 0 .4em;
+.site-footer {
+  border-top: 1px solid #e8e8e8;
+  padding: 30px 0;
 }

-.post ul, .post ol {
-  margin-left: 1.35em;
+.footer-heading {
+  font-size: 18px;
+  font-weight: 300;
+  letter-spacing: -.5px;
+  margin-bottom: 15px;
 }

+.site-footer .column { float: left; margin-bottom: 15px; }
+
+.footer-col-1 {
+  width: 270px; /*fallback*/
+  width: -webkit-calc(35% - 10px);
+  width: -moz-calc(35% - 10px);
+  width: -o-calc(35% - 10px);
+  width: calc(35% - 10px);
+  margin-right: 10px
+}
+.footer-col-2 {
+  width: 175px; /*fallback*/
+  width: -webkit-calc(23.125% - 10px);
+  width: -moz-calc(23.125% - 10px);
+  width: -o-calc(23.125% - 10px);
+  width: calc(23.125% - 10px);
+  margin-right: 10px
+}
+.footer-col-3 {
+  width: 335px; /*fallback*/
+  width: -webkit-calc(41.875%);
+  width: -moz-calc(41.875%);
+  width: -o-calc(41.875%);
+  width: calc(41.875%);
+}
+
+.site-footer ul { list-style: none; }
+
+.site-footer li,
+.site-footer p {
+  font-size: 15px;
+  letter-spacing: -.3px;
+  color: #828282;
+}
+
+.github-icon-svg,
+.twitter-icon-svg {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  position: relative;
+  top: 3px;
+}
+
+
+/* Page Content styles */
+/* ----------------------------------------------------------*/
+
+.page-content {
+  padding: 30px 0;
+  background-color: #fff;
+}
+
+
+/* Home styles */
+/* ----------------------------------------------------------*/
+
+.home h1 { margin-bottom: 25px; }
+
+.posts { list-style-type: none; }
+
+.posts li { margin-bottom: 30px; }
+
+.posts .post-link {
+  font-size: 24px;
+  letter-spacing: -1px;
+  line-height: 1;
+}
+
+.posts .post-date {
+  display: block;
+  font-size: 15px;
+  color: #818181;
+}
+
+
+/* Post styles */
+/* ----------------------------------------------------------*/
+
+.post-header { margin: 10px 0 30px; }
+
+.post-header h1 {
+  font-size: 42px;
+  letter-spacing: -1.75px;
+  line-height: 1;
+  font-weight: 300;
+}
+
+.post-header .meta {
+  font-size: 15px;
+  color: #818181;
+  margin-top: 5px;
+}
+
+.post-content { margin: 0 0 30px; }
+
+.post-content > * { margin: 20px 0; }
+
+
+.post-content h1,
+.post-content h2,
+.post-content h3,
+.post-content h4,
+.post-content h5,
+.post-content h6 {
+  line-height: 1;
+  font-weight: 300;
+  margin: 40px 0 20px;
+}
+
+.post-content h2 {
+  font-size: 32px;
+  letter-spacing: -1.25px;
+}
+
+.post-content h3 {
+  font-size: 26px;
+  letter-spacing: -1px;
+}
+
+.post-content h4 {
+  font-size: 20px;
+  letter-spacing: -1px;
+}
+
+.post-content blockquote {
+  border-left: 4px solid #e8e8e8;
+  padding-left: 20px;
+  font-size: 18px;
+  opacity: .6;
+  letter-spacing: -1px;
+  font-style: italic;
+  margin: 30px 0;
+}
+
+.post-content ul,
+.post-content ol { padding-left: 20px; }
+
+.post pre,
 .post code {
-  border: 1px solid #ddd;
+  border: 1px solid #d5d5e9;
  background-color: #eef;
-  padding: 0 .2em;
+  padding: 8px 12px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  font-size: 15px;
 }

-.post pre code {
-  border: none;
-}
+.post code { padding: 1px 5px; }
+
+.post ul,
+.post ol { margin-left: 1.35em; }
+
+.post pre code { border: none; }

 /* terminal */
 .post pre.terminal {
  border: 1px solid #000;
  background-color: #333;
  color: #FFF;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
 }

-.post pre.terminal code {
-  background-color: #333;
+.post pre.terminal code { background-color: #333; }
+
+/* Syntax highlighting styles */
+/* ----------------------------------------------------------*/
+
+.highlight  { background: #ffffff; }
+.highlight .c { color: #999988; font-style: italic } /* Comment */
+.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .k { font-weight: bold } /* Keyword */
+.highlight .o { font-weight: bold } /* Operator */
+.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
+.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #aa0000 } /* Generic.Error */
+.highlight .gh { color: #999999 } /* Generic.Heading */
+.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
+.highlight .go { color: #888888 } /* Generic.Output */
+.highlight .gp { color: #555555 } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
+.highlight .gt { color: #aa0000 } /* Generic.Traceback */
+.highlight .kc { font-weight: bold } /* Keyword.Constant */
+.highlight .kd { font-weight: bold } /* Keyword.Declaration */
+.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #009999 } /* Literal.Number */
+.highlight .s { color: #d14 } /* Literal.String */
+.highlight .na { color: #008080 } /* Name.Attribute */
+.highlight .nb { color: #0086B3 } /* Name.Builtin */
+.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
+.highlight .no { color: #008080 } /* Name.Constant */
+.highlight .ni { color: #800080 } /* Name.Entity */
+.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nt { color: #000080 } /* Name.Tag */
+.highlight .nv { color: #008080 } /* Name.Variable */
+.highlight .ow { font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #009999 } /* Literal.Number.Float */
+.highlight .mh { color: #009999 } /* Literal.Number.Hex */
+.highlight .mi { color: #009999 } /* Literal.Number.Integer */
+.highlight .mo { color: #009999 } /* Literal.Number.Oct */
+.highlight .sb { color: #d14 } /* Literal.String.Backtick */
+.highlight .sc { color: #d14 } /* Literal.String.Char */
+.highlight .sd { color: #d14 } /* Literal.String.Doc */
+.highlight .s2 { color: #d14 } /* Literal.String.Double */
+.highlight .se { color: #d14 } /* Literal.String.Escape */
+.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
+.highlight .si { color: #d14 } /* Literal.String.Interpol */
+.highlight .sx { color: #d14 } /* Literal.String.Other */
+.highlight .sr { color: #009926 } /* Literal.String.Regex */
+.highlight .s1 { color: #d14 } /* Literal.String.Single */
+.highlight .ss { color: #990073 } /* Literal.String.Symbol */
+.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #008080 } /* Name.Variable.Class */
+.highlight .vg { color: #008080 } /* Name.Variable.Global */
+.highlight .vi { color: #008080 } /* Name.Variable.Instance */
+.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
+
+
+/* media queries */
+/* ----------------------------------------------------------*/
+
+
+@media screen and (max-width: 750px) {
+
+  .footer-col-1 { width: 50%; }
+
+  .footer-col-2 {
+    width: 45%; /*fallback*/
+    width: -webkit-calc(50% - 10px);
+    width: -moz-calc(50% - 10px);
+    width: -o-calc(50% - 10px);
+    width: calc(50% - 10px);
+    margin-right: 0;
+  }
+
+  .site-footer .column.footer-col-3 {
+    width: auto;
+    float: none;
+    clear: both;
+  }
+
 }
+
+@media screen and (max-width: 600px) {
+
+  .wrap { padding: 0 12px; }
+
+  .site-nav {
+    position: fixed;
+    z-index: 10;
+    top: 14px; right: 8px;
+    background-color: white;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 1px solid #e8e8e8;
+  }
+
+  .site-nav .menu-icon {
+    display: block;
+    font-size: 24px;
+    color: #505050;
+    float: right;
+    width: 36px;
+    text-align: center;
+    line-height: 36px;
+  }
+
+  .site-nav .menu-icon svg { width: 18px; height: 16px; }
+
+  .site-nav .trigger {
+    clear: both;
+    margin-bottom: 5px;
+    display: none;
+  }
+
+  .site-nav:hover .trigger { display: block; }
+
+  .site-nav .page-link {
+    display: block;
+    text-align: right;
+    line-height: 1.25;
+    padding: 5px 10px;
+    margin: 0;
+  }
+
+  .post-header h1 { font-size: 36px; }
+  .post-content h2 { font-size: 28px; }
+  .post-content h3 { font-size: 22px; }
+  .post-content h4 { font-size: 18px; }
+  .post-content blockquote { padding-left: 10px; }
+  .post-content ul,
+  .post-content ol { padding-left: 10px; }
+
+  .site-footer .column {
+    float: none;
+    clear: both;
+    width: auto;
+    margin: 0 0 15px; }
+
+}
--- a/lib/site_template/css/syntax.css
+++ b/lib/site_template/css/syntax.css
@@ -1,60 +0,0 @@
-.highlight  { background: #ffffff; }
-.highlight .c { color: #999988; font-style: italic } /* Comment */
-.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { font-weight: bold } /* Keyword */
-.highlight .o { font-weight: bold } /* Operator */
-.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #aa0000 } /* Generic.Error */
-.highlight .gh { color: #999999 } /* Generic.Heading */
-.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
-.highlight .go { color: #888888 } /* Generic.Output */
-.highlight .gp { color: #555555 } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
-.highlight .gt { color: #aa0000 } /* Generic.Traceback */
-.highlight .kc { font-weight: bold } /* Keyword.Constant */
-.highlight .kd { font-weight: bold } /* Keyword.Declaration */
-.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
-.highlight .kr { font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #009999 } /* Literal.Number */
-.highlight .s { color: #d14 } /* Literal.String */
-.highlight .na { color: #008080 } /* Name.Attribute */
-.highlight .nb { color: #0086B3 } /* Name.Builtin */
-.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
-.highlight .no { color: #008080 } /* Name.Constant */
-.highlight .ni { color: #800080 } /* Name.Entity */
-.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
-.highlight .nn { color: #555555 } /* Name.Namespace */
-.highlight .nt { color: #000080 } /* Name.Tag */
-.highlight .nv { color: #008080 } /* Name.Variable */
-.highlight .ow { font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #009999 } /* Literal.Number.Float */
-.highlight .mh { color: #009999 } /* Literal.Number.Hex */
-.highlight .mi { color: #009999 } /* Literal.Number.Integer */
-.highlight .mo { color: #009999 } /* Literal.Number.Oct */
-.highlight .sb { color: #d14 } /* Literal.String.Backtick */
-.highlight .sc { color: #d14 } /* Literal.String.Char */
-.highlight .sd { color: #d14 } /* Literal.String.Doc */
-.highlight .s2 { color: #d14 } /* Literal.String.Double */
-.highlight .se { color: #d14 } /* Literal.String.Escape */
-.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
-.highlight .si { color: #d14 } /* Literal.String.Interpol */
-.highlight .sx { color: #d14 } /* Literal.String.Other */
-.highlight .sr { color: #009926 } /* Literal.String.Regex */
-.highlight .s1 { color: #d14 } /* Literal.String.Single */
-.highlight .ss { color: #990073 } /* Literal.String.Symbol */
-.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #008080 } /* Name.Variable.Class */
-.highlight .vg { color: #008080 } /* Name.Variable.Global */
-.highlight .vi { color: #008080 } /* Name.Variable.Instance */
-.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
--- a/lib/site_template/feed.xml
+++ b/lib/site_template/feed.xml
@@ -0,0 +1,21 @@
+---
+layout: none
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ site.name | xml_escape }}</title>
+    <description>{{ site.description | xml_escape }}</description>
+    <link>{{ site.baseurl }}</link>
+    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl }}" rel="self" type="application/rss+xml" />
+    {% for post in site.posts limit:10 %}
+      <item>
+        <title>{{ post.title | xml_escape }}</title>
+        <description>{{ post.content | xml_escape }}</description>
+        <pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+        <link>{{ post.url | prepend: site.baseurl }}</link>
+        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl }}</guid>
+      </item>
+    {% endfor %}
+  </channel>
+</rss>
--- a/lib/site_template/index.html
+++ b/lib/site_template/index.html
@@ -1,13 +1,20 @@
 ---
 layout: default
-title: Your New Jekyll Site
 ---

-<div id="home">
-  <h1>Blog Posts</h1>
+<div class="home">
+
+  <h1>Posts</h1>
+
  <ul class="posts">
    {% for post in site.posts %}
-      <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ post.url }}">{{ post.title }}</a></li>
+      <li>
+        <span class="post-date">{{ post.date | date: "%b %-d, %Y" }}</span>
+        <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+      </li>
    {% endfor %}
  </ul>
-</div>
+
+  <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></p>
+
+</div>
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -1,2 +1,4 @@
 #!/bin/sh
+
+script/branding
 bundle install
--- a/script/branding
+++ b/script/branding
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+echo " ---------------------------------------------------------- "
+echo "          _   ______   _  __ __     __  _        _          "
+echo "         | | |  ____| | |/ / \ \   / / | |      | |         "
+echo "         | | | |__    | ' /   \ \_/ /  | |      | |         "
+echo "     _   | | |  __|   |  <     \   /   | |      | |         "
+echo "    | |__| | | |____  | . \     | |    | |____  | |____     "
+echo "     \____/  |______| |_|\_\    |_|    |______| |______|    "
+echo "                                                            "
+echo " ---------------------------------------------------------- "
--- a/script/cibuild
+++ b/script/cibuild
@@ -0,0 +1,4 @@
+#! /bin/bash
+
+script/branding
+bundle exec rake
--- a/script/console
+++ b/script/console
@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require 'pry'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
+require 'jekyll'
+
+TEST_DIR = File.expand_path(File.join(File.dirname(__FILE__), *%w{ .. test }))
+
+def fixture_site(overrides = {})
+  Jekyll::Site.new(site_configuration(overrides))
+end
+
+def build_configs(overrides, base_hash = Jekyll::Configuration::DEFAULTS)
+  Jekyll::Utils.deep_merge_hashes(base_hash, overrides)
+end
+
+def site_configuration(overrides = {})
+  build_configs({
+    "source"      => source_dir,
+    "destination" => dest_dir
+  }, build_configs(overrides))
+end
+
+def dest_dir(*subdirs)
+  test_dir('dest', *subdirs)
+end
+
+def source_dir(*subdirs)
+  test_dir('source', *subdirs)
+end
+
+def test_dir(*subdirs)
+  File.join(TEST_DIR, *subdirs)
+end
+
+module Jekyll
+  binding.pry
+end
--- a/script/rebund
+++ b/script/rebund
@@ -0,0 +1,140 @@
+#!/bin/bash
+#
+# rebund(1)
+#
+# Author: Julien Letessier
+# Homepage: https://github.com/mezis/rebund
+# License:
+#
+# Copyright (c) 2014 HouseTrip Ltd
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+# Configuration
+: ${REBUND_CREDENTIALS:=user:secret}
+: ${REBUND_ENDPOINT=http://keyfile-production.herokuapp.com}
+: ${REBUND_TARBALL:=bundle.tbz}
+: ${REBUND_BUNDLE_DIR:=vendor/bundle}
+
+
+
+log() {
+  echo "rebund: $*" > /dev/stderr
+}
+
+die() {
+  echo "fatal: $*" > /dev/stderr
+  exit 1
+}
+
+success() {
+  log "$*"
+  exit 0
+}
+
+on_error() {
+  die 'unknown error.'
+}
+
+get_ruby_version() {
+  bundle exec ruby --version
+}
+
+get_gemfile() {
+  bundle exec sh -c 'echo $BUNDLE_GEMFILE'
+}
+
+calculate_hash() {
+  (get_ruby_version ; cat $(get_gemfile)) | openssl sha256 | sed -e 's/.* //'
+}
+
+build_tarball() {
+  test -e $REBUND_BUNDLE_DIR || die "cannot find bundle directory in ${REBUND_BUNDLE_DIR}"
+  test -e $REBUND_TARBALL && success 'bundle already uploaded'
+  tar jcf $REBUND_TARBALL $REBUND_BUNDLE_DIR
+}
+
+upload_tarball() {
+  curl --fail \
+    -F filedata=@${REBUND_TARBALL} \
+    --digest --user $REBUND_CREDENTIALS \
+    ${REBUND_ENDPOINT}/$(calculate_hash) \
+  || success "could not upload bundle"
+}
+
+expand_tarball() {
+  test -e $REBUND_TARBALL || success "no tarball"
+  tar jxf $REBUND_TARBALL
+}
+
+download_tarball() {
+  curl --fail \
+    --location \
+    -o ${REBUND_TARBALL} \
+    --digest --user $REBUND_CREDENTIALS \
+    ${REBUND_ENDPOINT}/$(calculate_hash) \
+    || success "could not download bundle"
+}
+
+rebund_upload() {
+  build_tarball
+  upload_tarball
+}
+
+rebund_download() {
+  download_tarball
+  expand_tarball
+}
+
+rebund_usage() {
+  success "usage: $0 [-v] [upload|download]"
+}
+
+# cath errors
+trap on_error ERR
+
+# inherit the ERR trap in subprocesses
+set -E
+
+while test $# -gt 0 ; do
+  case $1 in
+    -v)
+      set -x
+      ;;
+    upload)
+      rebund_upload
+      exit 0
+      ;;
+    download)
+      rebund_download
+      exit 0
+      ;;
+    *)
+      rebund_usage
+      exit 1
+      ;;
+  esac
+  shift
+done
+
+rebund_usage
--- a/script/test
+++ b/script/test
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+set -x
+
+if [ -z "$1" ]; then
+  TEST_FILES="test/test*.rb"
+else
+  TEST_FILES="$@"
+fi
+
+/usr/bin/env bundle exec ruby -I"lib:test" -r rake -r rake/rake_test_loader ${TEST_FILES}
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -1,6 +1,7 @@
-pygments: true
+highlighter: pygments
 relative_permalinks: false
 gauges_id: 503c5af6613f5d0f19000027
 permalink: /news/:year/:month/:day/:title/
 excerpt_separator: noifniof3nioaniof3nioafafinoafnoif
-repository: https://github.com/mojombo/jekyll
+repository: https://github.com/jekyll/jekyll
+help_url: https://github.com/jekyll/jekyll-help
--- a/site/_data/docs.yml
+++ b/site/_data/docs.yml
@@ -0,0 +1,45 @@
+- title: Getting Started
+  docs:
+  - home
+  - quickstart
+  - installation
+  - usage
+  - structure
+  - configuration
+
+- title: Your Content
+  docs:
+  - frontmatter
+  - posts
+  - drafts
+  - pages
+  - variables
+  - collections
+  - datafiles
+  - assets
+  - migrations
+
+- title: Customization
+  docs:
+  - templates
+  - permalinks
+  - pagination
+  - plugins
+  - extras
+
+- title: Deployment
+  docs:
+  - github-pages
+  - deployment-methods
+
+- title: Miscellaneous
+  docs:
+  - troubleshooting
+  - sites
+  - resources
+  - upgrading
+
+- title: Meta
+  docs:
+  - contributing
+  - history
--- a/site/_includes/analytics.html
+++ b/site/_includes/analytics.html
@@ -1,6 +1,6 @@
 {% if site.gauges_id %}
  <!-- Gauges (http://gaug.es/) -->
-  <script type="text/javascript">
+  <script>
    var _gauges = _gauges || [];
    (function() {
      var t   = document.createElement('script');
@@ -17,7 +17,7 @@

 {% if site.google_analytics_id %}
  <!-- Google Analytics (http://google.com/analytics) -->
-  <script type="text/javascript">
+  <script>
    var _gaq = _gaq || [];
    _gaq.push(['_setAccount', '{{ site.google_analytics_id }}']);
    _gaq.push(['_setDomainName', '{{ site.url }}']); // Multiple sub-domains
--- a/site/_includes/css/gridism.css
+++ b/site/_includes/css/gridism.css
--- a/site/_includes/css/normalize.css
+++ b/site/_includes/css/normalize.css
@@ -0,0 +1 @@
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
--- a/site/_includes/css/pygments.css
+++ b/site/_includes/css/pygments.css
@@ -68,3 +68,5 @@
 .highlight .vg { color: #98fb98} /* Name.Variable.Global */
 .highlight .vi { color: #98fb98} /* Name.Variable.Instance */
 .highlight .il { color: #ffffff} /* Literal.Number.Integer.Long */
+
+.highlight .bash .nv {-webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; -o-user-select: none; user-select: none; }
--- a/site/_includes/css/style.css
+++ b/site/_includes/css/style.css
--- a/site/_includes/docs_contents.html
+++ b/site/_includes/docs_contents.html
@@ -1,16 +1,8 @@
 <div class="unit one-fifth hide-on-mobiles">
  <aside>
-    <h4>Getting Started</h4>
-    {% include docs_ul.html items='home quickstart installation usage structure configuration' %}
-    <h4>Your Content</h4>
-    {% include docs_ul.html items='frontmatter posts drafts pages variables datafiles migrations' %}
-    <h4>Customization</h4>
-    {% include docs_ul.html items='templates permalinks pagination plugins extras' %}
-    <h4>Deployment</h4>
-    {% include docs_ul.html items='github-pages deployment-methods' %}
-    <h4>Miscellaneous</h4>
-    {% include docs_ul.html items='troubleshooting sites resources upgrading' %}
-    <h4>Meta</h4>
-    {% include docs_ul.html items='contributing history' %}
+    {% for section in site.data.docs %}
+    <h4>{{ section.title }}</h4>
+    {% include docs_ul.html items=section.docs %}
+    {% endfor %}
  </aside>
 </div>
--- a/site/_includes/docs_contents_mobile.html
+++ b/site/_includes/docs_contents_mobile.html
@@ -1,23 +1,10 @@
 <div class="docs-nav-mobile unit whole show-on-mobiles">
  <select onchange="if (this.value) window.location.href=this.value">
    <option value="">Navigate the docs…</option>
-    <optgroup label="Getting started">
-      {% include docs_option.html items='home quickstart installation usage structure configuration' %}
-    </optgroup>
-    <optgroup label="Your Content">
-      {% include docs_option.html items='frontmatter posts drafts pages variables datafiles migrations' %}
-    </optgroup>
-    <optgroup label="Customization">
-      {% include docs_option.html items='templates permalinks pagination plugins extras' %}
-    </optgroup>
-    <optgroup label="Deployment">
-      {% include docs_option.html items='github-pages deployment-methods' %}
-    </optgroup>
-    <optgroup label="Miscellaneous">
-      {% include docs_option.html items='troubleshooting sites resources upgrading' %}
-    </optgroup>
-    <optgroup label="Meta">
-      {% include docs_option.html items='contributing history' %}
+    {% for section in site.data.docs %}
+    <optgroup label="{{ section.title }}">
+      {% include docs_option.html items=section.docs %}
    </optgroup>
+    {% endfor %}
  </select>
 </div>
--- a/site/_includes/docs_option.html
+++ b/site/_includes/docs_option.html
@@ -1,7 +1,7 @@
-{% assign items = include.items | split: ' ' %}
+{% assign items = include.items %}

 {% for item in items %}
-  {% assign item_url = item | prepend:'/docs/' | append:'/' %}
+  {% assign item_url = item | prepend:"/docs/" | append:"/" %}

  {% for p in site.pages %}
    {% if p.url == item_url %}
--- a/site/_includes/docs_ul.html
+++ b/site/_includes/docs_ul.html
@@ -1,13 +1,13 @@
-{% assign items = include.items | split: ' ' %}
+{% assign items = include.items %}

 <ul>
 {% for item in items %}
-  {% assign item_url = item | prepend:'/docs/' | append:'/' %}
+  {% assign item_url = item | prepend:"/docs/" | append:"/" %}

  {% if item_url == page.url %}
-    {% assign c = 'current' %}
+    {% assign c = "current" %}
  {% else %}
-    {% assign c = '' %}
+    {% assign c = "" %}
  {% endif %}

  {% for p in site.pages %}
@@ -16,5 +16,5 @@
    {% endif %}
  {% endfor %}

-{% endfor %}  
+{% endfor %}
 </ul>
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				/! normalize.css v3.0.0 \| MIT License \| git.io/normalize /html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}