Merge branch 'release/0.6.0' into develop
Use released berkshelf
Include Chef in Gemfile
Prevent conflicts between our init script and the one provided by packages
Bump to 0.6.1
Prefix package key ID for reliable lookup
Merge branch 'release/0.6.1'