Merge pull request #1118 from rspec/add-rubocop

Followup to #1118 ping @cupakromer