Add "John Doe's Blog" to conversation feed
Merge branch 'master' into gh-pages