bundle install fixes for berkshelf2
Merge pull request #226 from opscode/sd/berkshelf2-fixes

bundle install fixes for berkshelf2