Octopress init
Fixing merge conflicts.