Rubocop: Upgrade to 0.13 by disabling some (but not all) new cops
Merge pull request #2970 from daviddavis/rubocop-0.13

Rubocop: Upgrade to 0.13