Update to current version of Octopress
Merge master to gh-pages branch for deploy