Assorted Fixes

Fixes made while integrating the 2.0.0+ version of this cookbook internally at Chef.

/cc @opscode-cookbooks/release-engineers