diff --git a/.gitignore b/.gitignore
index 874db46..3190277 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
 pkg/
 Gemfile.lock
 vendor/
 spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+log/
 .idea/
 *.iml
-log/
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..16f9cdb
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--color
+--format documentation
diff --git a/.sync.yml b/.sync.yml
deleted file mode 100644
index 08e91a7..0000000
--- a/.sync.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-.travis.yml:
-  includes:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
diff --git a/.travis.yml b/.travis.yml
index 001fb85..e6314a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,19 @@
 ---
 sudo: false
 language: ruby
+cache: bundler
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake validate lint spec"
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
+  - 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: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.6
-    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f1cbde4..bfeaa70 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,220 +1,220 @@
 Checklist (and a short version for the impatient)
 =================================================
 
   * Commits:
 
     - Make commits of logical units.
 
     - Check for unnecessary whitespace with "git diff --check" before
       committing.
 
     - Commit using Unix line endings (check the settings around "crlf" in
       git-config(1)).
 
     - Do not check in commented out code or unneeded files.
 
     - The first line of the commit message should be a short
       description (50 characters is the soft limit, excluding ticket
       number(s)), and should skip the full stop.
 
     - Associate the issue in the message. The first line should include
       the issue number in the form "(#XXXX) Rest of message".
 
     - The body should provide a meaningful commit message, which:
 
       - uses the imperative, present tense: "change", not "changed" or
         "changes".
 
       - includes motivation for the change, and contrasts its
         implementation with the previous behavior.
 
     - Make sure that you have tests for the bug you are fixing, or
       feature you are adding.
 
     - Make sure the test suites passes after your commit:
       `bundle exec rspec spec/acceptance` More information on [testing](#Testing) below
 
     - When introducing a new feature, make sure it is properly
       documented in the README.md
 
   * Submission:
 
     * Pre-requisites:
 
       - Make sure you have a [GitHub account](https://github.com/join)
 
       - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
 
     * Preferred method:
 
       - Fork the repository on GitHub.
 
       - Push your changes to a topic branch in your fork of the
         repository. (the format ticket/1234-short_description_of_change is
         usually preferred for this project).
 
       - Submit a pull request to the repository in the puppetlabs
         organization.
 
 The long version
 ================
 
   1.  Make separate commits for logically separate changes.
 
       Please break your commits down into logically consistent units
       which include new or changed tests relevant to the rest of the
       change.  The goal of doing this is to make the diff easier to
       read for whoever is reviewing your code.  In general, the easier
       your diff is to read, the more likely someone will be happy to
       review it and get it into the code base.
 
       If you are going to refactor a piece of code, please do so as a
       separate commit from your feature or bug fix changes.
 
       We also really appreciate changes that include tests to make
       sure the bug is not re-introduced, and that the feature is not
       accidentally broken.
 
       Describe the technical detail of the change(s).  If your
       description starts to get too long, that is a good sign that you
       probably need to split up your commit into more finely grained
       pieces.
 
       Commits which plainly describe the things which help
       reviewers check the patch and future developers understand the
       code are much more likely to be merged in with a minimum of
       bike-shedding or requested changes.  Ideally, the commit message
       would include information, and be in a form suitable for
       inclusion in the release notes for the version of Puppet that
       includes them.
 
       Please also check that you are not introducing any trailing
       whitespace or other "whitespace errors".  You can do this by
       running "git diff --check" on your changes before you commit.
 
   2.  Sending your patches
 
       To submit your changes via a GitHub pull request, we _highly_
       recommend that you have them on a topic branch, instead of
       directly on "master".
       It makes things much easier to keep track of, especially if
       you decide to work on another thing before your first change
       is merged in.
 
       GitHub has some pretty good
       [general documentation](http://help.github.com/) on using
       their site.  They also have documentation on
       [creating pull requests](http://help.github.com/send-pull-requests/).
 
       In general, after pushing your topic branch up to your
       repository on GitHub, you can switch to the branch in the
       GitHub UI and click "Pull Request" towards the top of the page
       in order to open a pull request.
 
 
   3.  Update the related GitHub issue.
 
       If there is a GitHub issue associated with the change you
       submitted, then you should update the ticket to include the
       location of your branch, along with any other commentary you
       may wish to make.
 
 Testing
 =======
 
 Getting Started
 ---------------
 
 Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
 package manager such as [bundler](http://bundler.io/) what Ruby packages,
 or Gems, are required to build, develop, and test this software.
 
 Please make sure you have [bundler installed](http://bundler.io/#getting-started)
 on your system, then use it to install all dependencies needed for this project,
 by running
 
 ```shell
 % bundle install
 Fetching gem metadata from https://rubygems.org/........
 Fetching gem metadata from https://rubygems.org/..
 Using rake (10.1.0)
 Using builder (3.2.2)
 -- 8><-- many more --><8 --
 Using rspec-system-puppet (2.2.0)
 Using serverspec (0.6.3)
 Using rspec-system-serverspec (1.0.0)
 Using bundler (1.3.5)
 Your bundle is complete!
 Use `bundle show [gemname]` to see where a bundled gem is installed.
 ```
 
 NOTE some systems may require you to run this command with sudo.
 
 If you already have those gems installed, make sure they are up-to-date:
 
 ```shell
 % bundle update
 ```
 
 With all dependencies in place and up-to-date we can now run the tests:
 
 ```shell
-% rake spec
+% bundle exec rake spec
 ```
 
 This will execute all the [rspec tests](http://rspec-puppet.com/) tests
 under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
 and so on. rspec tests may have the same kind of dependencies as the
 module they are testing. While the module defines in its [Modulefile](./Modulefile),
 rspec tests define them in [.fixtures.yml](./fixtures.yml).
 
 Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
 tests. These tests spin up a virtual machine under
 [VirtualBox](https://www.virtualbox.org/)) with, controlling it with
 [Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
 scenarios. In order to run these, you will need both of those tools
 installed on your system.
 
 You can run them by issuing the following command
 
 ```shell
-% rake spec_clean
-% rspec spec/acceptance
+% bundle exec rake spec_clean
+% bundle exec rspec spec/acceptance
 ```
 
 This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
 install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
 and then run all the tests under [spec/acceptance](./spec/acceptance).
 
 Writing Tests
 -------------
 
 XXX getting started writing tests.
 
 If you have commit access to the repository
 ===========================================
 
 Even if you have commit access to the repository, you will still need to
 go through the process above, and have someone else review and merge
 in your changes.  The rule is that all changes must be reviewed by a
 developer on the project (that did not write the code) to ensure that
 all changes go through a code review process.
 
 Having someone other than the author of the topic branch recorded as
 performing the merge is the record that they performed the code
 review.
 
 
 Additional Resources
 ====================
 
 * [Getting additional help](http://puppetlabs.com/community/get-help)
 
 * [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
 
 * [Patchwork](https://patchwork.puppetlabs.com)
 
 * [General GitHub documentation](http://help.github.com/)
 
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
 
diff --git a/Gemfile b/Gemfile
index bfe64b1..ced190e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,48 +1,48 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 def location_for(place, fake_version = nil)
-  if place =~ /^(git:[^#]*)#(.*)/
+  if place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false }]
   else
     [place, { :require => false }]
   end
 end
 
 group :development, :unit_tests do
-  gem 'rspec-core', '3.1.7',     :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'simplecov',               :require => false
-  gem 'puppet_facts',            :require => false
-  gem 'json',                    :require => false
+  gem 'json',                      :require => false
+  gem 'metadata-json-lint',        :require => false
+  gem 'puppet_facts',              :require => false
+  gem 'puppet-blacksmith',         :require => false
+  gem 'puppetlabs_spec_helper',    :require => false
+  gem 'rspec-puppet', '>= 2.3.2',  :require => false
+  gem 'simplecov',                 :require => false
 end
-
 group :system_tests do
+  gem 'beaker-puppet_install_helper',  :require => false
   if beaker_version = ENV['BEAKER_VERSION']
     gem 'beaker', *location_for(beaker_version)
   end
   if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
     gem 'beaker-rspec',  :require => false
   end
-  gem 'serverspec',    :require => false
-  gem 'beaker-puppet_install_helper', :require => false
+  gem 'master_manipulator',            :require => false
+  gem 'serverspec',                    :require => false
 end
 
-
-
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else
   gem 'facter', :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else
   gem 'puppet', :require => false
 end
 
 # vim:ft=ruby
diff --git a/Rakefile b/Rakefile
index 181157e..35ce311 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,11 @@
-require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
+require 'puppetlabs_spec_helper/rake_tasks'
 
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml
index 6d110a6..2ad90b8 100644
--- a/spec/acceptance/nodesets/centos-59-x64.yml
+++ b/spec/acceptance/nodesets/centos-59-x64.yml
@@ -1,10 +1,10 @@
 HOSTS:
   centos-59-x64:
     roles:
       - master
     platform: el-5-x86_64
     box : centos-59-x64-vbox4210-nocm
-    box_url : https://atlas.hashicorp.com/puppetlabs/boxes/centos-59-x64-vbox4210-nocm.box
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
   type: git
diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml
index 8e20d74..7d9242f 100644
--- a/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ b/spec/acceptance/nodesets/centos-64-x64-pe.yml
@@ -1,12 +1,12 @@
 HOSTS:
   centos-64-x64:
     roles:
       - master
       - database
       - dashboard
     platform: el-6-x86_64
     box : centos-64-x64-vbox4210-nocm
-    box_url : https://atlas.hashicorp.com/puppetlabs/boxes/centos-64-x64-vbox4210-nocm.box
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
   type: pe
diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
index e0677fa..4e2cb80 100644
--- a/spec/acceptance/nodesets/centos-65-x64.yml
+++ b/spec/acceptance/nodesets/centos-65-x64.yml
@@ -1,10 +1,10 @@
 HOSTS:
   centos-65-x64:
     roles:
       - master
     platform: el-6-x86_64
     box : centos-65-x64-vbox436-nocm
-    box_url : https://atlas.hashicorp.com/puppetlabs/boxes/centos-65-x64-virtualbox-nocm.box
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
     hypervisor : vagrant
 CONFIG:
   type: foss
diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
index 7f5e198..5ca1514 100644
--- a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
@@ -1,10 +1,10 @@
 HOSTS:
   ubuntu-server-10044-x64:
     roles:
       - master
     platform: ubuntu-10.04-amd64
     box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : https://atlas.hashicorp.com/puppetlabs/boxes/ubuntu-server-10044-x64-vbox4210-nocm.box
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
   type: foss
diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
index 05bdde7..d065b30 100644
--- a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
@@ -1,10 +1,10 @@
 HOSTS:
   ubuntu-server-12042-x64:
     roles:
       - master
     platform: ubuntu-12.04-amd64
     box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : https://atlas.hashicorp.com/puppetlabs/boxes/ubuntu-server-12042-x64-vbox4210-nocm.box
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
     hypervisor : vagrant
 CONFIG:
   type: foss
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2c6f566..a7f5b4e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1 +1,7 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
+
+# put local configuration and setup into spec_helper_local
+begin
+  require 'spec_helper_local'
+rescue LoadError
+end