Regenerating rubocop config, fixing a few of the new offenses
Merge pull request #283 from meatballhat/rubocop-touchup

Regenerating rubocop config, fixing a few of the new offenses