Rubocop: Fixing config based on feedback
Merge pull request #2910 from daviddavis/temp/20130909192603

Rubocop: Fixing config based on feedback