Inject octopress.
Merge branch 'master' of https://github.com/jamiefolsom/jamiefolsom.github.io