Update history to reflect merge of #2189 [ci skip]
Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults

* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
  move self.type to convertible
  oops, fix minor indentation quirk
  document frontmatter defaults precedence
  adjust frontmatter defaults precedence handling
  change cucumber feature to test for precedence too
  fix frontmatter defaults for custom paths
  more robust cucumber features
  fix slash handling for paths
  move cucumber features to own file
  fix minor docs quirk
  improve path checking, now using Pathname instead of regex
  Add site documentation for the new feature
  add inline code docs
  improve validation code
  fix for Ruby 1.8
  Add basic cucumber features for frontmatter defaults
  Retrieve frontmatter defaults when retrieved internally
  make frontmatter defaults available to liquid
  add a class `FrontmatterDefaults` for handling of frontmatter defaults
  Add a method to retrieve type to post, page and draft

Conflicts:
	lib/jekyll.rb
	lib/jekyll/convertible.rb
	lib/jekyll/core_ext.rb
	lib/jekyll/page.rb
	lib/jekyll/post.rb
Post#published is no longer a thing.
Update history to reflect merge of #2206 [ci skip]
Remove duplicate entry in list of third-party plugins (#2206)
Deep merge data overrides into defaults.
require newline after start of yaml header
Slightly improve favicon.ico.

Trim the whitespace so that the tube looks bigger while maintaining the aspect ratio.
Use File.exist? instead of deprecated File.exists?
Merge pull request #2213 from XhmikosR/docs-favicon
Update history to reflect merge of #2213 [ci skip]
Merge pull request #2214 from stomar/file-exists
Update history to reflect merge of #2214 [ci skip]
add test for PGP key yaml frontmatter
add a cucumber feature to test "published" for pages
Add an --unpublished option to render unpublished posts

Fixes #1337, #469.
add the Publisher class to handle publishing logic
Use Publisher instead of Post#published?
Support "published: false" for pages

Fixes 1034.
Add feature for the "--unsupported" flag

Also make step definitions a little more generic.