Rubocop: Fixing top level models directory
Merge pull request #2864 from daviddavis/temp/20130901120718

Rubocop: Fixing top level models directory
Rubocop: Fixing app/lib directory