Rubocop: Upgrading to latest release
Rubocop: Fixed failures
Rubocop: Adding block method check
Merge pull request #3125 from daviddavis/temp/20131008130758

Rubocop: Upgrading to newest version