Fix Rubocop

During the rename the configuration to fix certain style issues in
IntelliJ was lost. This change reinstates that setting, and fixes the
error that was missed.
Merge branch 'fix-rubocop'