Fix failing Travis CI tests.

* Berkshelf was removed from the Gemfile in: edaeddc318c3f406e0f360b428d4601fac952beb
* Newer Rubocop is a pedant.

SQUASH