Next version bump
Improving berkshelf integration

Berkshelf has obsoleted Berkshelf-shims in v2. Extend the
berkshelf integration to determine which version is present and
use the appropriate cookbook installation method.
Merge branch 'release/0.0.5'