update octopress and conflict .ruby-version
change title