ran rubocop autocorrect

[Bobby-H]

52 files inspected, 1759 offenses detected, 1649 offenses corrected

[yozlet]

Yay, thank you for this! (I say that as someone who came to Ruby after 1.9, and has a mild allergy to hashrocket syntax.)

Looks like there are still some conflicts to fix, and may be more as we work through the backlog of PRs. If you're happy to do another merge that'd be great, otherwise I can do the rubocop autocorrect locally.

[yozlet]

Actually, it'd likely be easier to just kill this branch and start again with a fresh pull rather than try to fix the conflicts.

[ultrasaurus]

closing this PR, tracking in this issue: #285