merge after regenerating site with new octopress version -take 2