Update Berksfile to berkshelf 3 format
Linting and formatting cleanup