Merging develop into master

As with the riak cookbook, going back to master as the main branch in accordance with community cookbooks.