Checking in to merge dalloway with master.
	modified:   atmosphere/settings.py.dist
	modified:   service/driver.py
	modified:   service/drivers/openstack_driver.py
	modified:   service/meta.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	atmosphere/settings.py.dist