Update berkshelf to 3.1, move dependencies to Berksfile, some rubocop cleanup