Updating to berkshelf 2

Updated to berkshelf 2 and adding in the berksfile.lock to the repo
as it is now safe to do so.