Octopress init
Merge conflicts resolved