Updates Octopress
Updates gem file
Removes conflicts in config.yml