Version updates

This change updates the versions of Ruby and the dependencies.  This
time round both rubocop and rspec required extensive changes for
compatibility.
Merge remote-tracking branch 'upstream/master'