diff --git a/.rubocop.yml b/.rubocop.yml
index 21617ba..9b4056a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,517 +1,508 @@
 require: rubocop-rspec
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
   Include:
     - ./**/*.rb
   Exclude:
     - files/**/*
     - vendor/**/*
     - .vendor/**/*
     - pkg/**/*
     - spec/fixtures/**/*
     - Gemfile
     - Rakefile
-Lint/ConditionPosition:
+Layout/ConditionPosition:
   Enabled: true
 
 Lint/ElseLayout:
   Enabled: true
 
 Lint/UnreachableCode:
   Enabled: true
 
 Lint/UselessComparison:
   Enabled: true
 
 Lint/EnsureReturn:
   Enabled: true
 
 Lint/HandleExceptions:
   Enabled: true
 
 Lint/ShadowingOuterLocalVariable:
   Enabled: true
 
 Lint/LiteralInInterpolation:
   Enabled: true
 
 Style/HashSyntax:
   Enabled: false
 
 Style/RedundantReturn:
   Enabled: true
 
 Lint/AmbiguousOperator:
   Enabled: true
 
 Lint/AssignmentInCondition:
   Enabled: true
 
 Layout/SpaceBeforeComment:
   Enabled: true
 
 Style/AndOr:
   Enabled: true
 
 Style/RedundantSelf:
   Enabled: true
 
 # Method length is not necessarily an indicator of code quality
 Metrics/MethodLength:
   Enabled: false
 
 # Module length is not necessarily an indicator of code quality
 Metrics/ModuleLength:
   Enabled: false
 
 Style/WhileUntilModifier:
   Enabled: true
 
 Lint/AmbiguousRegexpLiteral:
   Enabled: true
 
 Security/Eval:
   Enabled: true
 
-Lint/BlockAlignment:
+Layout/BlockAlignment:
   Enabled: true
 
-Lint/DefEndAlignment:
+Layout/DefEndAlignment:
   Enabled: true
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   Enabled: true
 
 Lint/DeprecatedClassMethods:
   Enabled: true
 
 Lint/Loop:
   Enabled: true
 
 Lint/ParenthesesAsGroupedExpression:
   Enabled: true
 
 Lint/RescueException:
   Enabled: true
 
 Lint/StringConversionInInterpolation:
   Enabled: true
 
 Lint/UnusedBlockArgument:
   Enabled: true
 
 Lint/UnusedMethodArgument:
   Enabled: true
 
 Lint/UselessAccessModifier:
   Enabled: true
 
 Lint/UselessAssignment:
   Enabled: true
 
 Lint/Void:
   Enabled: true
 
 Layout/AccessModifierIndentation:
   Enabled: true
 
 Naming/AccessorMethodName:
   Enabled: true
 
 Style/Alias:
   Enabled: true
 
 Layout/AlignArray:
   Enabled: true
 
 Layout/AlignHash:
   Enabled: true
 
 Layout/AlignParameters:
   Enabled: true
 
 Metrics/BlockNesting:
   Enabled: true
 
 Style/AsciiComments:
   Enabled: true
 
 Style/Attr:
   Enabled: true
 
 Style/BracesAroundHashParameters:
   Enabled: true
 
 Style/CaseEquality:
   Enabled: true
 
 Layout/CaseIndentation:
   Enabled: true
 
 Style/CharacterLiteral:
   Enabled: true
 
 Naming/ClassAndModuleCamelCase:
   Enabled: true
 
 Style/ClassAndModuleChildren:
   Enabled: false
 
 Style/ClassCheck:
   Enabled: true
 
 # Class length is not necessarily an indicator of code quality
 Metrics/ClassLength:
   Enabled: false
 
 Style/ClassMethods:
   Enabled: true
 
 Style/ClassVars:
   Enabled: true
 
 Style/WhenThen:
   Enabled: true
 
 Style/WordArray:
   Enabled: true
 
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Enabled: true
 
 Layout/Tab:
   Enabled: true
 
 Layout/SpaceBeforeSemicolon:
   Enabled: true
 
 Layout/TrailingBlankLines:
   Enabled: true
 
 Layout/SpaceInsideBlockBraces:
   Enabled: true
 
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: true
 
 Layout/SpaceInsideParens:
   Enabled: true
 
 Layout/LeadingCommentSpace:
   Enabled: true
 
-Layout/SpaceBeforeFirstArg:
-  Enabled: true
-
 Layout/SpaceAfterColon:
   Enabled: true
 
 Layout/SpaceAfterComma:
   Enabled: true
 
 Layout/SpaceAfterMethodName:
   Enabled: true
 
 Layout/SpaceAfterNot:
   Enabled: true
 
 Layout/SpaceAfterSemicolon:
   Enabled: true
 
 Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: true
 
 Layout/SpaceAroundOperators:
   Enabled: true
 
 Layout/SpaceBeforeBlockBraces:
   Enabled: true
 
 Layout/SpaceBeforeComma:
   Enabled: true
 
 Style/CollectionMethods:
   Enabled: true
 
 Layout/CommentIndentation:
   Enabled: true
 
 Style/ColonMethodCall:
   Enabled: true
 
 Style/CommentAnnotation:
   Enabled: true
 
 # 'Complexity' is very relative
 Metrics/CyclomaticComplexity:
   Enabled: false
 
 Naming/ConstantName:
   Enabled: true
 
 Style/Documentation:
   Enabled: false
 
 Style/DefWithParentheses:
   Enabled: true
 
 Style/PreferredHashMethods:
   Enabled: true
 
 Layout/DotPosition:
   EnforcedStyle: trailing
 
 Style/DoubleNegation:
   Enabled: true
 
 Style/EachWithObject:
   Enabled: true
 
 Layout/EmptyLineBetweenDefs:
   Enabled: true
 
-Layout/IndentArray:
+Layout/IndentFirstArrayElement:
   Enabled: true
 
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   Enabled: true
 
 Layout/IndentationConsistency:
   Enabled: true
 
 Layout/IndentationWidth:
   Enabled: true
 
 Layout/EmptyLines:
   Enabled: true
 
 Layout/EmptyLinesAroundAccessModifier:
   Enabled: true
 
 Style/EmptyLiteral:
   Enabled: true
 
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Enabled: false
 
 Style/MethodDefParentheses:
   Enabled: true
 
 Style/LineEndConcatenation:
   Enabled: true
 
 Layout/TrailingWhitespace:
   Enabled: true
 
 Style/StringLiterals:
   Enabled: true
 
 Style/TrailingCommaInArguments:
   Enabled: true
 
 Style/TrailingCommaInHashLiteral:
   Enabled: true
 
 Style/TrailingCommaInArrayLiteral:
   Enabled: true
 
 Style/GlobalVars:
   Enabled: true
 
 Style/GuardClause:
   Enabled: true
 
 Style/IfUnlessModifier:
   Enabled: true
 
 Style/MultilineIfThen:
   Enabled: true
 
 Style/NegatedIf:
   Enabled: true
 
 Style/NegatedWhile:
   Enabled: true
 
 Style/Next:
   Enabled: true
 
 Style/SingleLineBlockParams:
   Enabled: true
 
 Style/SingleLineMethods:
   Enabled: true
 
 Style/SpecialGlobalVars:
   Enabled: true
 
 Style/TrivialAccessors:
   Enabled: true
 
 Style/UnlessElse:
   Enabled: true
 
 Style/VariableInterpolation:
   Enabled: true
 
 Naming/VariableName:
   Enabled: true
 
 Style/WhileUntilDo:
   Enabled: true
 
 Style/EvenOdd:
   Enabled: true
 
 Naming/FileName:
   Enabled: true
 
 Style/For:
   Enabled: true
 
 Style/Lambda:
   Enabled: true
 
 Naming/MethodName:
   Enabled: true
 
 Style/MultilineTernaryOperator:
   Enabled: true
 
 Style/NestedTernaryOperator:
   Enabled: true
 
 Style/NilComparison:
   Enabled: true
 
 Style/FormatString:
   Enabled: true
 
 Style/MultilineBlockChain:
   Enabled: true
 
 Style/Semicolon:
   Enabled: true
 
 Style/SignalException:
   Enabled: true
 
 Style/NonNilCheck:
   Enabled: true
 
 Style/Not:
   Enabled: true
 
 Style/NumericLiterals:
   Enabled: true
 
 Style/OneLineConditional:
   Enabled: true
 
 Naming/BinaryOperatorParameterName:
   Enabled: true
 
 Style/ParenthesesAroundCondition:
   Enabled: true
 
 Style/PercentLiteralDelimiters:
   Enabled: true
 
 Style/PerlBackrefs:
   Enabled: true
 
 Naming/PredicateName:
   Enabled: true
 
 Style/RedundantException:
   Enabled: true
 
 Style/SelfAssignment:
   Enabled: true
 
 Style/Proc:
   Enabled: true
 
 Style/RaiseArgs:
   Enabled: true
 
 Style/RedundantBegin:
   Enabled: true
 
 Style/RescueModifier:
   Enabled: true
 
 # based on https://github.com/voxpupuli/modulesync_config/issues/168
 Style/RegexpLiteral:
   EnforcedStyle: percent_r
   Enabled: true
 
 Lint/UnderscorePrefixedVariableName:
   Enabled: true
 
 Metrics/ParameterLists:
   Enabled: false
 
 Lint/RequireParentheses:
   Enabled: true
 
 Layout/SpaceBeforeFirstArg:
   Enabled: true
 
 Style/ModuleFunction:
   Enabled: true
 
 Lint/Debugger:
   Enabled: true
 
 Style/IfWithSemicolon:
   Enabled: true
 
 Style/Encoding:
   Enabled: true
 
 Style/BlockDelimiters:
   Enabled: true
 
 Style/FormatStringToken:
   Enabled: false
 
 Layout/MultilineBlockLayout:
   Enabled: true
 
 # 'Complexity' is very relative
 Metrics/AbcSize:
   Enabled: False
 
 Metrics/BlockLength:
   Enabled: False
 
 # 'Complexity' is very relative
 Metrics/PerceivedComplexity:
   Enabled: False
 
-Lint/UselessAssignment:
-  Enabled: true
-
 Layout/ClosingParenthesisIndentation:
   Enabled: false
 
-Metrics/BlockLength:
-  Enabled: false
-
 # RSpec
 
 # We don't use rspec in this way
 RSpec/DescribeClass:
   Enabled: False
 
 # Example length is not necessarily an indicator of code quality
 RSpec/ExampleLength:
   Enabled: False
 
 RSpec/NestedGroups:
   Max: 4
 
 RSpec/MultipleExpectations:
   Max: 2
diff --git a/manifests/params.pp b/manifests/params.pp
index 4da13b8..70db137 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,226 +1,226 @@
 #class sudo::params
 #Set the paramters for the sudo module
 class sudo::params {
   $content_base     = "${module_name}/"
   $config_file_mode = '0440'
   $config_dir_mode  = '0550'
 
   case $::osfamily {
     'Debian': {
       case $::operatingsystem {
         'Ubuntu': {
           $content = "${content_base}sudoers.ubuntu.erb"
         }
         default: {
           if (versioncmp($::operatingsystemmajrelease, '7') >= 0) or
             ($::operatingsystemmajrelease =~ /\/sid/) or
             ($::operatingsystemmajrelease =~ /Kali/) {
             $content = "${content_base}sudoers.debian.erb"
           } else {
             $content = "${content_base}sudoers.olddebian.erb"
           }
         }
       }
       $package = 'sudo'
       $package_ldap = 'sudo-ldap'
       $package_ensure    = 'present'
       $package_source    = ''
       $package_admin_file = ''
       $config_file       = '/etc/sudoers'
       $config_dir        = '/etc/sudoers.d'
       $config_file_group = 'root'
       $config_dir_keepme = false
     }
     'RedHat': {
       $package = 'sudo'
       # in redhat sudo package is already compiled for ldap support
       $package_ldap = $package
 
       # rhel 5.0 to 5.4 use sudo 1.6.9 which does not support
       # includedir, so we have to make sure sudo 1.7 (comes with rhel
       # 5.5) is installed.
       $package_ensure = $::operatingsystemrelease ? {
         /^5.[01234]$/ => 'latest',
         default      => 'present',
       }
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = $::operatingsystemrelease ? {
         /^5/    => "${content_base}sudoers.rhel5.erb",
         /^6/    => "${content_base}sudoers.rhel6.erb",
         /^7/    => "${content_base}sudoers.rhel7.erb",
         default => "${content_base}sudoers.rhel6.erb",
         }
       $config_file_group = 'root'
       $config_dir_keepme = false
     }
     'Suse': {
       $package = 'sudo'
       $package_ldap = $package
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = "${content_base}sudoers.suse.erb"
       $config_file_group = 'root'
       $config_dir_keepme = false
     }
     'Solaris': {
       case $::operatingsystem {
         'OmniOS': {
           $package = 'sudo'
           $package_ldap = undef
           $package_ensure = 'present'
           $package_source = ''
           $package_admin_file = ''
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d'
           $content = "${content_base}sudoers.omnios.erb"
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
         'SmartOS': {
           $package = 'sudo'
           $package_ldap = undef
           $package_ensure = 'present'
           $package_source = ''
           $package_admin_file = ''
           $config_file = '/opt/local/etc/sudoers'
           $config_dir = '/opt/local/etc/sudoers.d'
           $content = "${content_base}sudoers.smartos.erb"
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
         default: {
           case $::kernelrelease {
             '5.11': {
               $package = 'pkg://solaris/security/sudo'
               $package_ldap = undef
               $package_ensure = 'present'
               $package_source = ''
               $package_admin_file = ''
               $config_file = '/etc/sudoers'
               $config_dir = '/etc/sudoers.d'
               $content = "${content_base}sudoers.solaris.erb"
               $config_file_group = 'root'
               $config_dir_keepme = false
             }
             '5.10': {
               $package = 'TCMsudo'
               $package_ldap = undef
               $package_ensure = 'present'
               $package_source = "http://www.sudo.ws/sudo/dist/packages/Solaris/10/TCMsudo-1.8.9p5-${::hardwareisa}.pkg.gz"
               $package_admin_file = '/var/sadm/install/admin/puppet'
               $config_file = '/etc/sudoers'
               $config_dir = '/etc/sudoers.d'
               $content = "${content_base}sudoers.solaris.erb"
               $config_file_group = 'root'
               $config_dir_keepme = false
             }
             default: {
               fail("Unsupported platform: ${::osfamily}/${::operatingsystem}/${::kernelrelease}")
             }
           }
         }
       }
     }
     'FreeBSD': {
       $package = 'security/sudo'
       $package_ldap = undef
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/usr/local/etc/sudoers'
       $config_dir = '/usr/local/etc/sudoers.d'
       $content = "${content_base}sudoers.freebsd.erb"
       $config_file_group = 'wheel'
       $config_dir_keepme = true
     }
     'OpenBSD': {
       if (versioncmp($::kernelversion, '5.8') < 0) {
         $package = undef
       } else {
         $package = 'sudo'
       }
       $package_ldap = undef
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = "${content_base}sudoers.openbsd.erb"
       $config_file_group = 'wheel'
       $config_dir_keepme = false
     }
     'AIX': {
       $package = 'sudo'
       $package_ldap = undef
       $package_ensure = 'present'
       $package_source = 'http://www.sudo.ws/sudo/dist/packages/AIX/5.3/sudo-1.8.9-6.aix53.lam.rpm'
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = "${content_base}sudoers.aix.erb"
       $config_file_group = 'system'
       $config_dir_keepme = false
     }
     'Darwin': {
       $package = undef
       $package_ldap = undef
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = "${content_base}sudoers.darwin.erb"
       $config_file_group = 'wheel'
       $config_dir_keepme = false
     }
     default: {
       case $::operatingsystem {
         'Gentoo': {
           $package = 'sudo'
           $package_ldap = $package
           $package_ensure = 'present'
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d'
           $content = "${content_base}sudoers.gentoo.erb"
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
-        'Archlinux': {
+        /^(Archlinux|Manjarolinux)$/: {
           $package = 'sudo'
           $package_ldap = $package
           $package_ensure = 'present'
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d'
           $content = "${content_base}sudoers.archlinux.erb"
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
         'Amazon': {
           $package = 'sudo'
           $package_ldap = $package
           $package_ensure = 'present'
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d'
           $content = $::operatingsystemrelease ? {
             /^5/    => "${content_base}sudoers.rhel5.erb",
             /^6/    => "${content_base}sudoers.rhel6.erb",
             default => "${content_base}sudoers.rhel6.erb",
           }
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
         default: {
           fail("Unsupported platform: ${::osfamily}/${::operatingsystem}")
         }
       }
       $package_source = ''
       $package_admin_file = ''
     }
   }
 }