Merge branch 'master' of https://github.com/imathis/octopress
Update octopress.
Merge branch 'master' into post-android-x86-instrumentation-tests