Octopress style merge