Rubocop: Fixing app/lib directory
Merge pull request #2861 from daviddavis/temp/20130831123621

Rubocop: Fixing app/lib directory
Rubocop: Cleaning up helpers