rubocop fixes

Like the title says, fixing travis builds, etc.