imathis/octopress — pull request #1051 by MrJoy (2013-02-21 20:29:41+00:00)
Title: Bring over a couple little things from master...

Bring over a couple small things from master into 2.1.