Octopress init
Fixing merge