Merge conflict with octopress initial push, delete original files