Rubocop: Fixing db directory problems
Merge pull request #2823 from daviddavis/temp/20130827163112

Rubocop: Fixing db directory problems