Merge branch 'master' of git://github.com/imathis/octopress into own_blog
Updated rake to version 0.9.6