This pull request addresses COOK-2623

Quite a few fairly major improvements to this cookbook.