Merge branch 'master' of git://github.com/imathis/octopress
Merge branch 'master' of github.com:kencrocken/kencrocken.github.io