Merge develop into master

Merging develop into master so that the develop branch can be killed off. The reasoning is that no other cookbooks out there follow the git-flow model as it's a bit overkill. blame me if inappropriate