Rubocop polishing

This change polishes the Rubocop configuration a bit
Merge remote-tracking branch 'upstream/master'