Hide Google Plus link if google_plus_hidden is true
Clean up categories.
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
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1
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
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1
Update Octopress.
Improvements to the regexes in setup_github_pages task
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1

Conflicts:
	Rakefile
Memory.