Merge pull request #1 from almost/gh-pages

Merge from upstream
Merge pull request #2 from almost/gh-pages

Merge from upstream
hubbub: Add a comment
Merge pull request #43 from hubbubcomments/comment-1416570355345

hubbub: New comment from Tom