ignore berkshelf lockfile
Berksfile proper name
Merge branch 'feature/berkshelf' into develop