Berksfile: cookbook paths and version refs improved
Gemfile: included Berkshelf 2 support