Style fixes - no functional changes

Cleans up a bunch of style warnings as output by rubocop. Some
still need to be addressed (particularily those due to cyclomatic
complexity) and some don't apply.

Moves VersionedDependencies mixin into it's own module for
consistency but no functional changes
Remove trailing whitespace