Use new RuboCop constant

https://github.com/bbatsov/rubocop/blob/master/CHANGELOG.md#0230-02062014
Fix deprecation warnings
Merge branch 'master' into docs