More consolidation in the guide
Merge pull request #198 from TekHus/master

More consolidation in the guide
Merge pull request #686 from KevWright/master

More consolidation in the guide