Integration Fixes

Fixes for various things found while doing integration testing with our `opscode-ci` wrapper cookbook.

/cc @opscode-cookbooks/release-engineers