Revert "Merge branch 'master' of https://github.com/imathis/octopress"

Because of https://github.com/imathis/octopress/issues/1625

This reverts commit a12b3c5f7ed4030e96f7bcb4bc90fb8f44caf5db, reversing
changes made to fbd8832b543a6c8313ccff366c43572575e2608e.

Conflicts:
	Gemfile.lock
Fix titles in post and improve CSS for code titles