More rubocop

@localshred follow up from the last PR. This gets us nearly all the way to rubocop-completeness, but more importantly, it makes the tests run again, which I broke in the last PR :(
going with the proverbial flow. these opinions all come from https://github.com/bbatsov/ruby-style-guide which has quite a lot of acceptance in the community