Rubocop: Relaxing checks
Merge pull request #2839 from daviddavis/temp/20130829075020

Rubocop: Relaxing checks