diff --git a/.fixtures.yml b/.fixtures.yml
index 14af97b..7546ed7 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -6,5 +6,7 @@ fixtures:
     stdlib:
       repo: "puppetlabs/stdlib"
       ref: "4.2.0"
+    concat:
+      repo: "puppetlabs/concat"
   symlinks:
     curator: "#{source_dir}"
diff --git a/.travis.yml b/.travis.yml
index 61edded..e0bbed8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,18 @@
-#This file is generated by ModuleSync, do not edit.
 ---
-sudo: false
 language: ruby
-cache: bundler
-bundler_args: --without system_tests development
-script: "bundle exec rake test"
-before_install: rm Gemfile.lock || true
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+bundler_args: --without development
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.1.6
-    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.6.0"
-notifications:
-  email: false
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+sudo: false
diff --git a/Gemfile b/Gemfile
index 053e3b4..3c2cf45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,60 +1,37 @@
-#This file is generated by ModuleSync, do not edit.
+source 'https://rubygems.org'
 
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 2.7'
 
-def location_for(place, version = nil)
-  if place =~ /^(git[:@][^#]*)#(.*)/
-    [version, { :git => $1, :branch => $2, :require => false}].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false}]
-  else
-    [place, version, { :require => false}].compact
-  end
-end
-
-group :unit_tests do
-  gem 'rake',                                                       :require => false
-  gem 'metadata-json-lint',                                         :require => false
-  gem 'rspec-puppet-facts',                                         :require => false
-  gem 'puppetlabs_spec_helper',                                     :require => false
-  gem 'rspec-puppet', '>= 2.3.2',                                   :require => false
-  gem 'parallel_tests',                                             :require => false
-  gem 'simplecov',                                                  :require => false
-  gem 'puppet-lint-unquoted_string-check',                          :require => false
-  gem 'puppet-lint-leading_zero-check',                             :require => false
-  gem 'puppet-lint-variable_contains_upcase',                       :require => false
-  gem 'puppet-lint-absolute_classname-check',                       :require => false
-  gem 'puppet-lint-trailing_comma-check',                           :require => false
-  gem 'puppet-lint-file_ensure-check',                              :require => false
-  gem 'puppet-lint-empty_string-check',                             :require => false
-  gem 'puppet-lint-undef_in_function-check',                        :require => false
-  gem 'puppet-lint-version_comparison-check',                       :require => false
-  gem 'puppet-lint-appends-check',                                  :require => false
-  gem 'puppet-lint-spaceship_operator_without_tag-check',           :require => false
-  gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  :require => false
-  gem 'puppet-lint-param-docs',                                     :require => false
-  gem 'puppet-lint-absolute_template_path',                         :require => false
-  gem 'puppet-lint-numericvariable',                                :require => false
-  gem 'puppet-lint-strict_indent-check',                            :require => false
-  gem 'puppet-lint-resource_reference_syntax',                      :require => false
-  gem 'puppet-lint-usascii_format-check',                           :require => false
-  gem 'puppet-lint-duplicate_class_parameters-check',               :require => false
-end
-group :development do
-  gem 'puppet-blacksmith',  :require => false
-  gem 'travis',             :require => false
-  gem 'travis-lint',        :require => false
-  gem 'guard-rake',         :require => false
-end
-group :system_tests do
-  gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
-  gem 'beaker',                        *location_for(ENV['BEAKER_VERSION'])
-  gem 'beaker-puppet_install_helper',  :require => false
-end
-
-gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
-gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
-
-if File.exists? "#{__FILE__}.local"
-  eval(File.read("#{__FILE__}.local"), binding)
-end
+gem 'rake'
+gem 'rspec', '~> 3.0'
+gem 'rspec-puppet', '~> 2.3'
+gem 'rspec-puppet-facts', '>= 1.7'
+gem 'puppetlabs_spec_helper', '>= 0.8.0'
+gem 'puppet-lint'
+gem 'puppet-lint-absolute_classname-check'
+gem 'puppet-lint-absolute_template_path'
+gem 'puppet-lint-appends-check'
+gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
+gem 'puppet-lint-empty_string-check'
+gem 'puppet-lint-file_ensure-check'
+gem 'puppet-lint-leading_zero-check'
+gem 'puppet-lint-numericvariable'
+gem 'puppet-lint-param-docs', '>= 1.3.0'
+gem 'puppet-lint-resource_reference_syntax'
+gem 'puppet-lint-spaceship_operator_without_tag-check'
+gem 'puppet-lint-strict_indent-check'
+gem 'puppet-lint-trailing_comma-check'
+gem 'puppet-lint-undef_in_function-check'
+gem 'puppet-lint-unquoted_string-check'
+gem 'puppet-lint-usascii_format-check'
+gem 'puppet-lint-variable_contains_upcase'
+gem 'puppet-lint-version_comparison-check'
+gem 'simplecov'
+gem 'puppet-blacksmith', '>= 3.1.0', {"groups"=>["development"]}
+gem 'json', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
+gem 'json_pure', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
+gem 'metadata-json-lint'
+gem 'webmock', '< 2.0'
+gem 'addressable', '< 2.4', {"platforms"=>["ruby_18"]}
+gem 'oauth'
+gem 'parallel_tests'
diff --git a/README.md b/README.md
index f2ac3c2..07b88c3 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ Default: false
 String.  Path to configuration file. You must ensure that the directory path exists.
 Default: '/root/.curator/curator.yml'
 
-#####`actions_file`
+#####`action_file`
 String.  Path to actions file. You must ensure that the directory path exists.
 Default: '/root/.curator/actions.yml'
 
diff --git a/metadata.json b/metadata.json
index df37c6e..ea311c9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "cristifalcas-curator",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "author": "Cristian Falcas <cristifalcas@gmail.com>",
   "license": "Apache-2.0",
   "summary": "Installs elasticsearch curator",
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e1aad7f..f89fca6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,8 +7,3 @@
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
 end
-
-# put local configuration and setup into spec_helper_local
-begin
-  require 'spec_helper_local'
-end