fixed issue #949 using @alexkirmse's patch
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1
Update Octopress.