some new rubocop fixes + disabling a newer cop
Merge pull request #92 from reaperhulk/moar-rubocop

some new rubocop fixes + disabling a newer cop