Calm rubocop; also, delete unneeded gem
Merge branch 'master' into dev