Fix 5 occurrences of 'ConstantName: Use SCREAMING_SNAKE_CASE for constants.' messages from Rubocop.
Fix lack of trailing newline to avoid clobbering git.
Fix one more 'ConstantName: Use SCREAMING_SNAKE_CASE for constants.' message from Rubocop.
Merge pull request #1274 from MrJoy/rubocop_fixups

Rubocop fixups