diff --git a/.rubocop.yml b/.rubocop.yml
index e4d810a..f70c35c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -63,6 +63,10 @@ Style/RedundantSelf:
 Metrics/MethodLength:
   Enabled: false
 
+# DISABLED
+Metrics/BlockLength:
+  Enabled: false
+
 # DISABLED - not useful
 Style/WhileUntilModifier:
   Enabled: false
@@ -72,7 +76,7 @@ Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
 # DISABLED
-Lint/Eval:
+Security/Eval:
   Enabled: false
 
 # DISABLED
@@ -211,16 +215,13 @@ Style/SpaceInsideParens:
 Style/LeadingCommentSpace:
   Enabled: false
 
-Style/SingleSpaceBeforeFirstArg:
-  Enabled: false
-
 Style/SpaceAfterColon:
   Enabled: false
 
 Style/SpaceAfterComma:
   Enabled: false
 
-Style/SpaceAfterControlKeyword:
+Style/SpaceAroundKeyword:
   Enabled: false
 
 Style/SpaceAfterMethodName:
@@ -268,8 +269,8 @@ Style/Documentation:
 Style/DefWithParentheses:
   Enabled: false
 
-Style/DeprecatedHashMethods:
-  Enabled: false
+#Style/DeprecatedHashMethods:
+#  Enabled: false
 
 Style/DotPosition:
   Enabled: false
@@ -308,7 +309,7 @@ Style/EmptyLiteral:
 Metrics/LineLength:
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Enabled: false
 
 Style/MethodDefParentheses:
@@ -323,7 +324,7 @@ Style/TrailingWhitespace:
 Style/StringLiterals:
   Enabled: false
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
   Enabled: false
 
 Style/GlobalVars:
@@ -464,7 +465,7 @@ Metrics/ParameterLists:
 Lint/RequireParentheses:
   Enabled: false
 
-Lint/SpaceBeforeFirstArg:
+Style/SpaceBeforeFirstArg:
   Enabled: false
 
 Style/ModuleFunction:
diff --git a/Gemfile b/Gemfile
index 3e18996..94f72bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,39 +2,39 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :test do
   puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 4.9']
-  gem "rake"
+  gem "metadata-json-lint"
   gem "puppet", puppetversion
+  gem "puppetlabs_spec_helper"
+  gem "rake"
   gem "rspec", '> 3.4.0'
   gem "rspec-puppet"
-  gem "puppetlabs_spec_helper"
-  gem "metadata-json-lint"
   gem "rspec-puppet-facts"
-  gem 'rubocop', '0.42.0'
+  gem 'rubocop'
   gem 'simplecov', '>= 0.11.0'
   gem 'simplecov-console'
 
   gem "puppet-lint-absolute_classname-check"
-  gem "puppet-lint-leading_zero-check"
-  gem "puppet-lint-trailing_comma-check"
-  gem "puppet-lint-version_comparison-check"
   gem "puppet-lint-classes_and_types_beginning_with_digits-check"
-  gem "puppet-lint-unquoted_string-check"
+  gem "puppet-lint-leading_zero-check"
   gem 'puppet-lint-resource_reference_syntax'
+  gem "puppet-lint-trailing_comma-check"
+  gem "puppet-lint-unquoted_string-check"
+  gem "puppet-lint-version_comparison-check"
 
   gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
 end
 
 group :development do
-  gem "travis"              if RUBY_VERSION >= '2.1.0'
-  gem "travis-lint"         if RUBY_VERSION >= '2.1.0'
-  gem "puppet-blacksmith"
   gem "guard-rake" if RUBY_VERSION >= '2.2.5' # per dependency https://rubygems.org/gems/ruby_dep
-  gem 'yard'
+  gem "puppet-blacksmith"
   gem 'puppet-strings'
+  gem "travis" if RUBY_VERSION >= '2.1.0'
+  gem "travis-lint" if RUBY_VERSION >= '2.1.0'
+  gem 'yard'
 end
 
 group :system_tests do
   gem "beaker"
-  gem "beaker-rspec"
   gem "beaker-puppet_install_helper"
+  gem "beaker-rspec"
 end