Merge pull request #1730 from ktf/gh-pages

Add cleaned up quick recipe from Martin.
Make explicit where to look for rebase tutorial.
Merge pull request #1759 from ktf/gh-pages

Make explicit where to look for rebase tutorial.
Drop mention of the topic collector.