[COOK-2623] This pull request addresses

https://tickets.opscode.com/browse/COOK-2623

Quite a few fairly major improvements to this cookbook.