Downstream changes from @jfwood.
Add berkshelf support.
Merge pull request #1 from dmend/master

Add error for chef solo; add Berkshelf support.