Update berkshelf

Includes:
    Update gitignore
    Add Berksfile.lock

Change-Id: I1a3573dcfa71bf724e54baeb2e71ef8b7f8a5e39