Fixed an include bug in page layout
added ssh keys support (e.g. for Amazon ec2)
Hide Google Plus link if google_plus_hidden is true
Improved error message for category_generator plugin. Addresses #116
Fixed blockquote plugin (author alone would not show up without title)

Conflicts:
	plugins/blockquote.rb
Merge pull request #932 from zellux/2.1

Hide Google Plus link if google_plus_hidden is true
Video tag plugin now supports mp4,ogv,webm formats, closes #931
setup_github_pages: allow for clones missing .git extension

Conflicts:
	Rakefile
Improved draft management options
- rake list_drafts shows current drafts. Closes #645
- Rake generate, watch, and preview can compile future dated posts (defaults to false). Closes #837
Improvements to the regexes in setup_github_pages task
Modified rake tasks to use iso8601 format dates and added configuration option to force a specfic timezone to be used
Improved timezone support
- Rake task list_drafts fixes
- Added link to timezone documentation
Made it easy to optionally use RubyPython for pygments, closes #923
Merge pull request #903 from mneorr/ssh_key

added ssh keys support (e.g. for Amazon ec2)
Updated configuration structure and dependent code. Added Octopress module for easier sharing of helper methods.
Merge 2.1 with new-configs
No longer testing on 1.8.7
Added Travis badge to README.
Setting default env
Added Octopress.env