initial scrub support
Working scrub
Merge branch 'master' into rackspace-rebuild

Conflicts:
	metadata.rb
	recipes/additional_users.rb