Updating to latest, trying to resolve octopress/jekyll mess