Octopress init
fix merge