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 :(
Heh, by the same token, the previous style here (spaces in arrays but not hashes) was not particularly consistent. I think the real benefit is not in the style nits themselves, but in the presence of an automated tool that deals with all the BS on your behalf, and provides you the guarantee that style is at least consistent throughout.