update
Merge branch 'blog' of git://github.com/Airead/octopress into blog