More rubocop config tweaks, adding encoding comments for 1.9