diff --git a/Puppetfile b/Puppetfile
index e1bdf63..8fba99b 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.0.2"
 
 # 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 "go",         "1.0.0"
 github "homebrew",   "1.4.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.5.0"
 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..2317568 100644
--- a/Puppetfile.lock
+++ b/Puppetfile.lock
@@ -1,8 +1,3 @@
-GITHUBTARBALL
-  remote: boxen/puppet-autoconf
-  specs:
-    autoconf (1.0.0)
-
 GITHUBTARBALL
   remote: boxen/puppet-boxen
   specs:
@@ -13,6 +8,11 @@ GITHUBTARBALL
   specs:
     dnsmasq (1.0.0)
 
+GITHUBTARBALL
+  remote: boxen/puppet-foreman
+  specs:
+    foreman (1.0.0)
+
 GITHUBTARBALL
   remote: boxen/puppet-gcc
   specs:
@@ -23,6 +23,11 @@ GITHUBTARBALL
   specs:
     git (1.2.5)
 
+GITHUBTARBALL
+  remote: boxen/puppet-go
+  specs:
+    go (1.0.0)
+
 GITHUBTARBALL
   remote: boxen/puppet-homebrew
   specs:
@@ -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.5.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-sudo
@@ -79,19 +94,22 @@ GITHUBTARBALL
     stdlib (4.1.0)
 
 DEPENDENCIES
-  autoconf (= 1.0.0)
   boxen (= 3.0.2)
   dnsmasq (= 1.0.0)
+  foreman (= 1.0.0)
   gcc (= 2.0.1)
   git (= 1.2.5)
+  go (= 1.0.0)
   homebrew (= 1.4.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.5.0)
   stdlib (= 4.1.0)
   sudo (= 1.0.0)
   xquartz (= 1.1.0)
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-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.5.0.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-6.5.0.tar.gz
new file mode 100644
index 0000000..17ea52e
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-ruby-6.5.0.tar.gz differ