Rubocop fixes -- Depends on All the Other PRs

Merge everything else first pls.

This is everything else with some rubocop style fixes on top.