Revert "Merge branch 'master' of git://github.com/imathis/octopress into source"

This reverts commit 074013de6c59d9974c6395c2b846c77482ed8d1e, reversing
changes made to b55d396d9dd08f2f6b2ca69f30deb164eed78679.

Conflicts:
	.themes/classic/sass/base/_theme.scss
	.themes/classic/sass/screen.scss
	.themes/classic/source/_includes/post/sharing.html
	.themes/classic/source/_includes/twitter_sharing.html
	.travis.yml
	Gemfile
	Gemfile.lock
	Rakefile
	config.rb
	plugins/gist_tag.rb
	plugins/jsfiddle.rb
	plugins/pygments_code.rb