Merge branch 'master' into cleanup-nodes

Conflicts:
	chef/nodes/balancer.rubygems.org.json
	chef/nodes/vagrant-app.json
	chef/nodes/vagrant-db.json
	chef/nodes/vagrant-lb.json