Rubocop: Fixing a couple rules and turning them on
Merge pull request #2851 from daviddavis/temp/20130829190519

Rubocop: Fixing a couple rules and turning them on