diff --git a/Gemfile.lock b/Gemfile.lock
index d444376..3a15887 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     addressable (2.3.2)
     ansi (1.4.3)
-    aws-sdk (1.6.9)
+    aws-sdk (1.7.1)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
diff --git a/Puppetfile b/Puppetfile
index 0e6634f..3f845d3 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -10,17 +10,16 @@
 # Core modules for a basic development environment.
 # You can replace some/most of those if you want, but it's not recommended.
 
-mod "boxen",    "0.0.28", :github_tarball => "boxen/puppet-boxen"
+mod "boxen",    "0.1.8",  :github_tarball => "boxen/puppet-boxen"
 mod "dnsmasq",  "0.0.1",  :github_tarball => "boxen/puppet-dnsmasq"
 mod "git",      "0.0.3",  :github_tarball => "boxen/puppet-git"
 mod "hub",      "0.0.1",  :github_tarball => "boxen/puppet-hub"
-mod "homebrew", "0.0.15", :github_tarball => "boxen/puppet-homebrew"
+mod "homebrew", "0.0.17", :github_tarball => "boxen/puppet-homebrew"
 mod "inifile",  "0.0.1",  :github_tarball => "boxen/puppet-inifile"
 mod "nginx",    "0.0.2",  :github_tarball => "boxen/puppet-nginx"
 mod "nodejs",   "0.0.2",  :github_tarball => "boxen/puppet-nodejs"
 mod "nvm",      "0.0.5",  :github_tarball => "boxen/puppet-nvm"
-mod "rbenv",    "0.1.0",  :github_tarball => "boxen/puppet-rbenv"
-mod "ruby",     "0.2.0",  :github_tarball => "boxen/puppet-ruby"
+mod "ruby",     "0.4.0",  :github_tarball => "boxen/puppet-ruby"
 mod "stdlib",   "3.0.0",  :github_tarball => "puppetlabs/puppetlabs-stdlib"
 mod "sudo",     "0.0.1",  :github_tarball => "boxen/puppet-sudo"
 
diff --git a/Puppetfile.lock b/Puppetfile.lock
index 17653c7..fd3e32a 100644
--- a/Puppetfile.lock
+++ b/Puppetfile.lock
@@ -1,7 +1,7 @@
 GITHUBTARBALL
   remote: boxen/puppet-boxen
   specs:
-    boxen (0.0.28)
+    boxen (0.1.8)
 
 GITHUBTARBALL
   remote: boxen/puppet-dnsmasq
@@ -16,7 +16,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-homebrew
   specs:
-    homebrew (0.0.15)
+    homebrew (0.0.17)
 
 GITHUBTARBALL
   remote: boxen/puppet-hub
@@ -43,15 +43,10 @@ GITHUBTARBALL
   specs:
     nvm (0.0.5)
 
-GITHUBTARBALL
-  remote: boxen/puppet-rbenv
-  specs:
-    rbenv (0.1.0)
-
 GITHUBTARBALL
   remote: boxen/puppet-ruby
   specs:
-    ruby (0.2.0)
+    ruby (0.4.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-sudo
@@ -64,17 +59,16 @@ GITHUBTARBALL
     stdlib (3.0.0)
 
 DEPENDENCIES
-  boxen (= 0.0.28)
+  boxen (= 0.1.8)
   dnsmasq (= 0.0.1)
   git (= 0.0.3)
-  homebrew (= 0.0.15)
+  homebrew (= 0.0.17)
   hub (= 0.0.1)
   inifile (= 0.0.1)
   nginx (= 0.0.2)
   nodejs (= 0.0.2)
   nvm (= 0.0.5)
-  rbenv (= 0.1.0)
-  ruby (= 0.2.0)
+  ruby (= 0.4.0)
   stdlib (= 3.0.0)
   sudo (= 0.0.1)
 
diff --git a/manifests/site.pp b/manifests/site.pp
index db6592f..cb3e9ea 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -50,7 +50,7 @@ node default {
   include hub
   include nginx
   include nvm
-  include rbenv
+  include ruby
 
   # fail if FDE is not enabled
   if $::root_encrypted == false {
diff --git a/script/boxen b/script/boxen
index e90eb39..32c8277 100755
--- a/script/boxen
+++ b/script/boxen
@@ -32,6 +32,9 @@ unless ENV["BOXEN_NO_PULL"] || ARGV.include?("--no-pull")
     master = `git symbolic-ref HEAD`.chomp == "refs/heads/master"
     no_new_commits = system('git diff --exit-code --quiet origin/master master')
 
+    warn "Cannot auto-update due to unclean tree!" unless clean
+    warn "Cannot auto-update due to unpushed commits on master!" unless no_new_commits
+
     if clean && master && no_new_commits
       quietly = "> /dev/null 2>&1"
       fetch   = "(git fetch origin #{quietly})"
diff --git a/script/boxen-bootstrap b/script/boxen-bootstrap
new file mode 100755
index 0000000..0b91e65
--- /dev/null
+++ b/script/boxen-bootstrap
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# Make sure a project's deps are up-to-date.
+
+if File.executable? "script/bootstrap"
+  exec "script/bootstrap", *ARGV
+end
diff --git a/script/boxen-my-config b/script/boxen-my-config
new file mode 100755
index 0000000..3975d9e
--- /dev/null
+++ b/script/boxen-my-config
@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+# Show the path to your manifest in Boxen, creating if necessary.
+
+user = ENV["GH_LOGIN"]
+
+unless user
+  abort "GH_LOGIN is not defined. Please re-run Boxen."
+end
+
+editor = ENV["VISUAL"] || ENV["EDITOR"]
+home   = ENV["BOXEN_HOME"] + "/repo"
+user   = user.downcase
+path   = "#{home}/modules/people/manifests/#{user}.pp"
+
+unless File.exist? path
+  File.open path, "wb" do |f|
+    f.puts "class people::#{user} {"
+    f.puts "}"
+  end
+end
+
+exec(editor, path) if editor && system("tty -s")
+
+puts path
diff --git a/script/nuke b/script/nuke
new file mode 100755
index 0000000..d1ca2a5
--- /dev/null
+++ b/script/nuke
@@ -0,0 +1,51 @@
+#!/usr/bin/ruby
+
+require "optparse"
+
+unless ENV["USER"] == "root"
+  exec "sudo", $0, *ARGV
+end
+
+all      = false
+force    = false
+opt      = false
+services = false
+
+OptionParser.new do |o|
+  o.banner = "Remove most traces of Boxen from your machine."
+
+  o.on("--all",      "Remove everything possible.") { all      = true }
+  o.on("--force",    "Actually do it.")             { force    = true }
+  o.on("--help",     "Show this help.")             { abort o.to_s    }
+  o.on("--opt",      "Remove /opt/boxen.")          { opt      = true }
+  o.on("--services", "Remove and unload services.") { services = true }
+
+  o.parse!
+
+  abort o.to_s unless all || opt || services
+end
+
+unless force
+  warn "** I won't actually do anything unless you pass --force."
+end
+
+if all || services
+  boxen_services = []
+  boxen_services << Dir["/Library/Launch*/com.boxen.*.plist"]
+
+  boxen_services.flatten.each do |plist|
+    warn "-> Removing #{plist}."
+
+    if force
+      system "launchctl", "unload", "-w", plist
+      system "rm", "-f", plist
+    end
+  end
+
+  system "rm", "-f", "/etc/resolver/dev"
+end
+
+if all || opt
+  warn "-> Removing /opt/boxen."
+  system "rm", "-rf", "/opt/boxen" if force
+end
diff --git a/vendor/cache/aws-sdk-1.6.9.gem b/vendor/cache/aws-sdk-1.6.9.gem
deleted file mode 100644
index 38c1332..0000000
Binary files a/vendor/cache/aws-sdk-1.6.9.gem and /dev/null differ
diff --git a/vendor/cache/aws-sdk-1.7.1.gem b/vendor/cache/aws-sdk-1.7.1.gem
new file mode 100644
index 0000000..9780996
Binary files /dev/null and b/vendor/cache/aws-sdk-1.7.1.gem differ
diff --git a/vendor/puppet/cache/boxen-puppet-boxen-0.0.28.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-0.0.28.tar.gz
deleted file mode 100644
index 799305b..0000000
Binary files a/vendor/puppet/cache/boxen-puppet-boxen-0.0.28.tar.gz and /dev/null differ
diff --git a/vendor/puppet/cache/boxen-puppet-boxen-0.1.8.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-0.1.8.tar.gz
new file mode 100644
index 0000000..99a326a
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-boxen-0.1.8.tar.gz differ
diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-0.0.15.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-0.0.15.tar.gz
deleted file mode 100644
index f08ddf7..0000000
Binary files a/vendor/puppet/cache/boxen-puppet-homebrew-0.0.15.tar.gz and /dev/null differ
diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-0.0.17.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-0.0.17.tar.gz
new file mode 100644
index 0000000..1597b46
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-homebrew-0.0.17.tar.gz differ
diff --git a/vendor/puppet/cache/boxen-puppet-ruby-0.2.0.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-0.2.0.tar.gz
deleted file mode 100644
index b0eba0e..0000000
Binary files a/vendor/puppet/cache/boxen-puppet-ruby-0.2.0.tar.gz and /dev/null differ
diff --git a/vendor/puppet/cache/boxen-puppet-ruby-0.4.0.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-0.4.0.tar.gz
new file mode 100644
index 0000000..e99f635
Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-ruby-0.4.0.tar.gz differ