update octopress
Merge branch 'master' of git://github.com/imathis/octopress
update CNAME
update working Gemfile.lock
modify subtitle and description