More moving and shaking in the guide
Merge pull request #202 from TekHus/master

More moving and shaking in the guide
Merge pull request #690 from KevWright/master

More moving and shaking in the guide