Updates for vagrant 0.8.5 (see release notes for vagrant)

Vagrantfile

@@ -1,18 +1,18 @@
 #-*- mode: ruby; -*-
 
-@box = ENV['BOX'] || "natty64"
+@box = ENV["BOX"] || "natty64"
 
 def ipaddress(n=16) ; "172.16.172.#{n}" ; end
 
 def config(n, ip, &block)
   n.vm.box = @box
   n.vm.network ip
   n.vm.customize { |vm| vm.memory_size = 512 }
-  n.vm.provision :chef_server do |p|
+  n.vm.provision :chef_client do |p|
     p.chef_server_url = "http://#{ipaddress}:4000"
     p.validation_key_path = ".chef/validation.pem"
     p.log_level = :debug
-    p.json.merge!({ :ip => ip })
+    p.json = { :ip => ip }
     yield p if block
   end
   n.vm.provision :shell, :path => "scripts/node.sh"