is this thing on?
Merge branch 'master' of https://github.com/joaosaragossa/octopress