Version updates

This change updates the dependencies to their latest versions.  As
part of this, rubocop was updated.  The new version of rubocop
necessitated changes to the code base to be compliant.
Merge branch 'version-upgrades'