Rubocop: Fix deprecated hash methods
Merge pull request #2989 from daviddavis/temp/20130918102113

Rubocop: Fix deprecated hash methods