rename registry-setup to setup
Merge branch 'ha-registry' of github.com:mancdaz/glance into ha-registry

Conflicts:
	recipes/setup.rb