Updated from jekyll/jekyll#master.
Merge pull request #3 from jekyll/unbundle

Updated from jekyll/jekyll#master.