diff --git a/Gemfile b/Gemfile
index 9a3e0ed..ffb704d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,17 @@
 source "https://rubygems.org"
 
-gem "boxen", "~> 2.0.0"
-gem "open4", "~> 1.3"
+gem "boxen",                  "~> 2.0.4"
+gem "hiera",                  "~> 1.1"
+gem "librarian-puppet",       "~> 0.9.9"
+gem "puppet",                 "3.3.1"
+gem "puppet-lint",            "0.3.2"
+gem "puppetlabs_spec_helper", "0.4.1"
+gem "open4",                  "~> 1.3"
+gem "rake",                   "10.0.3"
+gem "rspec-puppet",           "0.1.6"
 
 group :development do
-  gem "aws-sdk"
+  gem "aws-sdk", "~> 1.21"
   gem "net-ssh"
   gem "rbvmomi"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c294743..be1d1ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,9 +3,9 @@ GEM
   specs:
     addressable (2.3.5)
     ansi (1.4.3)
-    aws-sdk (1.8.2)
+    aws-sdk (1.22.1)
       json (~> 1.4)
-      nokogiri (>= 1.4.4)
+      nokogiri (>= 1.4.4, < 1.6.0)
       uuidtools (~> 2.1)
     boxen (2.0.4)
       ansi (~> 1.4)
@@ -16,6 +16,7 @@ GEM
       octokit (~> 2.3.0)
       puppet (~> 3.0)
     builder (3.1.4)
+    diff-lcs (1.2.4)
     facter (1.7.3)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
@@ -27,6 +28,9 @@ GEM
     librarian-puppet (0.9.10)
       json
       thor (~> 0.15)
+    metaclass (0.0.1)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
     multipart-post (1.2.0)
     net-ssh (2.6.5)
     nokogiri (1.5.6)
@@ -37,24 +41,48 @@ GEM
       facter (~> 1.6)
       hiera (~> 1.0)
       rgen (~> 0.6.5)
+    puppet-lint (0.3.2)
+    puppetlabs_spec_helper (0.4.1)
+      mocha (>= 0.10.5)
+      rake
+      rspec (>= 2.9.0)
+      rspec-puppet (>= 0.1.1)
+    rake (10.0.3)
     rbvmomi (1.6.0)
       builder
       nokogiri (>= 1.4.1)
       trollop
     rgen (0.6.6)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    rspec-puppet (0.1.6)
+      rspec
     sawyer (0.5.1)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     thor (0.18.1)
     trollop (2.0)
-    uuidtools (2.1.3)
+    uuidtools (2.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-sdk
-  boxen (~> 2.0.0)
+  aws-sdk (~> 1.21)
+  boxen (~> 2.0.4)
+  hiera (~> 1.1)
+  librarian-puppet (~> 0.9.9)
   net-ssh
   open4 (~> 1.3)
+  puppet (= 3.3.1)
+  puppet-lint (= 0.3.2)
+  puppetlabs_spec_helper (= 0.4.1)
+  rake (= 10.0.3)
   rbvmomi
+  rspec-puppet (= 0.1.6)
diff --git a/Puppetfile b/Puppetfile
index e1bdf63..d146eec 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -4,32 +4,51 @@
 # default. This ensures at least the ability to construct a basic
 # environment.
 
-def github(name, version, options = nil)
-  options ||= {}
-  options[:repo] ||= "boxen/puppet-#{name}"
-  mod name, version, :github_tarball => options[:repo]
+# Shortcut for a module from GitHub's boxen organization
+def github(name, *args)
+  options ||= if args.last.is_a? Hash
+    args.last
+  else
+    {}
+  end
+
+  if path = options.delete(:path)
+    mod name, :path => path
+  else
+    version = args.first
+    options[:repo] ||= "boxen/puppet-#{name}"
+    mod name, version, :github_tarball => options[:repo]
+  end
+end
+
+# Shortcut for a module under development
+def dev(name, *args)
+  mod name, :path => "#{ENV['HOME']}/src/boxen/puppet-#{name}"
 end
 
 # Includes many of our custom types and providers, as well as global
 # config. Required.
 
-github "boxen",      "3.0.2"
+github "boxen", "3.3.4"
 
 # Core modules for a basic development environment. You can replace
 # some/most of these if you want, but it's not recommended.
 
-github "autoconf",   "1.0.0"
 github "dnsmasq",    "1.0.0"
+github "foreman",    "1.0.0"
 github "gcc",        "2.0.1"
 github "git",        "1.2.5"
-github "homebrew",   "1.4.1"
+github "go",         "1.0.0"
+github "homebrew",   "1.5.1"
 github "hub",        "1.0.3"
 github "inifile",    "1.0.0", :repo => "puppetlabs/puppetlabs-inifile"
 github "nginx",      "1.4.2"
-github "nodejs",     "3.2.9"
+github "nodejs",     "3.3.0"
 github "openssl",    "1.0.0"
+github "phantomjs",  "2.0.2"
+github "pkgconfig",  "1.0.0"
 github "repository", "2.2.0"
-github "ruby",       "6.3.4"
+github "ruby",       "6.7.2"
 github "stdlib",     "4.1.0", :repo => "puppetlabs/puppetlabs-stdlib"
 github "sudo",       "1.0.0"
 github "xquartz",    "1.1.0"
diff --git a/Puppetfile.lock b/Puppetfile.lock
index 991470f..a88c19e 100644
--- a/Puppetfile.lock
+++ b/Puppetfile.lock
@@ -1,18 +1,18 @@
-GITHUBTARBALL
-  remote: boxen/puppet-autoconf
-  specs:
-    autoconf (1.0.0)
-
 GITHUBTARBALL
   remote: boxen/puppet-boxen
   specs:
-    boxen (3.0.2)
+    boxen (3.3.4)
 
 GITHUBTARBALL
   remote: boxen/puppet-dnsmasq
   specs:
     dnsmasq (1.0.0)
 
+GITHUBTARBALL
+  remote: boxen/puppet-foreman
+  specs:
+    foreman (1.0.0)
+
 GITHUBTARBALL
   remote: boxen/puppet-gcc
   specs:
@@ -23,10 +23,15 @@ GITHUBTARBALL
   specs:
     git (1.2.5)
 
+GITHUBTARBALL
+  remote: boxen/puppet-go
+  specs:
+    go (1.0.0)
+
 GITHUBTARBALL
   remote: boxen/puppet-homebrew
   specs:
-    homebrew (1.4.1)
+    homebrew (1.5.1)
 
 GITHUBTARBALL
   remote: boxen/puppet-hub
@@ -41,13 +46,23 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-nodejs
   specs:
-    nodejs (3.2.9)
+    nodejs (3.3.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-openssl
   specs:
     openssl (1.0.0)
 
+GITHUBTARBALL
+  remote: boxen/puppet-phantomjs
+  specs:
+    phantomjs (2.0.2)
+
+GITHUBTARBALL
+  remote: boxen/puppet-pkgconfig
+  specs:
+    pkgconfig (1.0.0)
+
 GITHUBTARBALL
   remote: boxen/puppet-repository
   specs:
@@ -56,7 +71,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-ruby
   specs:
-    ruby (6.3.4)
+    ruby (6.7.2)
 
 GITHUBTARBALL
   remote: boxen/puppet-sudo
@@ -79,19 +94,22 @@ GITHUBTARBALL
     stdlib (4.1.0)
 
 DEPENDENCIES
-  autoconf (= 1.0.0)
-  boxen (= 3.0.2)
+  boxen (= 3.3.4)
   dnsmasq (= 1.0.0)
+  foreman (= 1.0.0)
   gcc (= 2.0.1)
   git (= 1.2.5)
-  homebrew (= 1.4.1)
+  go (= 1.0.0)
+  homebrew (= 1.5.1)
   hub (= 1.0.3)
   inifile (= 1.0.0)
   nginx (= 1.4.2)
-  nodejs (= 3.2.9)
+  nodejs (= 3.3.0)
   openssl (= 1.0.0)
+  phantomjs (= 2.0.2)
+  pkgconfig (= 1.0.0)
   repository (= 2.2.0)
-  ruby (= 6.3.4)
+  ruby (= 6.7.2)
   stdlib (= 4.1.0)
   sudo (= 1.0.0)
   xquartz (= 1.1.0)
diff --git a/vendor/cache/aws-sdk-1.22.1.gem b/vendor/cache/aws-sdk-1.22.1.gem
new file mode 100644
index 0000000..f502a0c
Binary files /dev/null and b/vendor/cache/aws-sdk-1.22.1.gem differ
diff --git a/vendor/cache/aws-sdk-1.8.2.gem b/vendor/cache/aws-sdk-1.8.2.gem
deleted file mode 100644
index 23c460c..0000000
Binary files a/vendor/cache/aws-sdk-1.8.2.gem and /dev/null differ
diff --git a/vendor/cache/diff-lcs-1.2.4.gem b/vendor/cache/diff-lcs-1.2.4.gem
new file mode 100644
index 0000000..53136fc
Binary files /dev/null and b/vendor/cache/diff-lcs-1.2.4.gem differ
diff --git a/vendor/cache/metaclass-0.0.1.gem b/vendor/cache/metaclass-0.0.1.gem
new file mode 100644
index 0000000..0054609
Binary files /dev/null and b/vendor/cache/metaclass-0.0.1.gem differ
diff --git a/vendor/cache/mocha-0.14.0.gem b/vendor/cache/mocha-0.14.0.gem
new file mode 100644
index 0000000..08f06c4
Binary files /dev/null and b/vendor/cache/mocha-0.14.0.gem differ
diff --git a/vendor/cache/puppet-lint-0.3.2.gem b/vendor/cache/puppet-lint-0.3.2.gem
new file mode 100644
index 0000000..e870183
Binary files /dev/null and b/vendor/cache/puppet-lint-0.3.2.gem differ
diff --git a/vendor/cache/puppetlabs_spec_helper-0.4.1.gem b/vendor/cache/puppetlabs_spec_helper-0.4.1.gem
new file mode 100644
index 0000000..a82b046
Binary files /dev/null and b/vendor/cache/puppetlabs_spec_helper-0.4.1.gem differ
diff --git a/vendor/cache/rake-10.0.3.gem b/vendor/cache/rake-10.0.3.gem
new file mode 100644
index 0000000..f645fa9
Binary files /dev/null and b/vendor/cache/rake-10.0.3.gem differ
diff --git a/vendor/cache/rspec-2.14.1.gem b/vendor/cache/rspec-2.14.1.gem
new file mode 100644
index 0000000..ea2c04a
Binary files /dev/null and b/vendor/cache/rspec-2.14.1.gem differ
diff --git a/vendor/cache/rspec-core-2.14.6.gem b/vendor/cache/rspec-core-2.14.6.gem
new file mode 100644
index 0000000..8edbb16
Binary files /dev/null and b/vendor/cache/rspec-core-2.14.6.gem differ
diff --git a/vendor/cache/rspec-expectations-2.14.3.gem b/vendor/cache/rspec-expectations-2.14.3.gem
new file mode 100644
index 0000000..278551f
Binary files /dev/null and b/vendor/cache/rspec-expectations-2.14.3.gem differ
diff --git a/vendor/cache/rspec-mocks-2.14.4.gem b/vendor/cache/rspec-mocks-2.14.4.gem
new file mode 100644
index 0000000..be3c6fd
Binary files /dev/null and b/vendor/cache/rspec-mocks-2.14.4.gem differ
diff --git a/vendor/cache/rspec-puppet-0.1.6.gem b/vendor/cache/rspec-puppet-0.1.6.gem
new file mode 100644
index 0000000..2a5b36f
Binary files /dev/null and b/vendor/cache/rspec-puppet-0.1.6.gem differ
diff --git a/vendor/cache/uuidtools-2.1.3.gem b/vendor/cache/uuidtools-2.1.3.gem
deleted file mode 100644
index a489d97..0000000
Binary files a/vendor/cache/uuidtools-2.1.3.gem and /dev/null differ
diff --git a/vendor/cache/uuidtools-2.1.4.gem b/vendor/cache/uuidtools-2.1.4.gem
new file mode 100644
index 0000000..6f59d76
Binary files /dev/null and b/vendor/cache/uuidtools-2.1.4.gem differ
diff --git a/vendor/puppet/cache/boxen-puppet-boxen-3.0.2.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-3.0.2.tar.gz
deleted file mode 100644
index 55e025f..0000000
Binary files a/vendor/puppet/cache/boxen-puppet-boxen-3.0.2.tar.gz and /dev/null differ
diff --git a/vendor/puppet/cache/boxen-puppet-boxen-3.3.4.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-3.3.4.tar.gz
new file mode 100644
index 0000000..8db5add
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-boxen-3.3.4.tar.gz differ
diff --git a/vendor/puppet/cache/boxen-puppet-foreman-1.0.0.tar.gz b/vendor/puppet/cache/boxen-puppet-foreman-1.0.0.tar.gz
new file mode 100644
index 0000000..66dc823
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-foreman-1.0.0.tar.gz differ
diff --git a/vendor/puppet/cache/boxen-puppet-go-1.0.0.tar.gz b/vendor/puppet/cache/boxen-puppet-go-1.0.0.tar.gz
new file mode 100644
index 0000000..ffa82c6
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-go-1.0.0.tar.gz differ
diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-1.4.1.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-1.4.1.tar.gz
deleted file mode 100644
index e361a59..0000000
Binary files a/vendor/puppet/cache/boxen-puppet-homebrew-1.4.1.tar.gz and /dev/null differ
diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-1.5.1.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-1.5.1.tar.gz
new file mode 100644
index 0000000..1b7fa55
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-homebrew-1.5.1.tar.gz differ
diff --git a/vendor/puppet/cache/boxen-puppet-nodejs-3.2.9.tar.gz b/vendor/puppet/cache/boxen-puppet-nodejs-3.2.9.tar.gz
deleted file mode 100644
index 080d421..0000000
Binary files a/vendor/puppet/cache/boxen-puppet-nodejs-3.2.9.tar.gz and /dev/null differ
diff --git a/vendor/puppet/cache/boxen-puppet-nodejs-3.3.0.tar.gz b/vendor/puppet/cache/boxen-puppet-nodejs-3.3.0.tar.gz
new file mode 100644
index 0000000..9fd81c6
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-nodejs-3.3.0.tar.gz differ
diff --git a/vendor/puppet/cache/boxen-puppet-phantomjs-2.0.2.tar.gz b/vendor/puppet/cache/boxen-puppet-phantomjs-2.0.2.tar.gz
new file mode 100644
index 0000000..7947744
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-phantomjs-2.0.2.tar.gz differ
diff --git a/vendor/puppet/cache/boxen-puppet-pkgconfig-1.0.0.tar.gz b/vendor/puppet/cache/boxen-puppet-pkgconfig-1.0.0.tar.gz
new file mode 100644
index 0000000..0241a74
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-pkgconfig-1.0.0.tar.gz differ
diff --git a/vendor/puppet/cache/boxen-puppet-ruby-6.3.4.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-6.3.4.tar.gz
deleted file mode 100644
index edc7836..0000000
Binary files a/vendor/puppet/cache/boxen-puppet-ruby-6.3.4.tar.gz and /dev/null differ
diff --git a/vendor/puppet/cache/boxen-puppet-ruby-6.7.2.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-6.7.2.tar.gz
new file mode 100644
index 0000000..ba4d92c
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-ruby-6.7.2.tar.gz differ