Rubocop: Fixing problems in the lib directory
Merge pull request #2820 from daviddavis/temp/20130827135827

Rubocop: Fixing problems in the lib directory