Dependency Updates

This change updates the dependencies of the buildpack.  It makes some
changes to the code in order to accommodate Rubocop.
Merge remote-tracking branch 'upstream/master'