Merge branch 'master' of http://github.com/imathis/octopress into source
Merge branch 'source' of github.com:larryprice/larryprice.github.com into source