uncommitted changes on registry-dev
Merge branch 'master' of https://github.com/ucldc/appstrap

Conflicts:
	ansible/tasks/shibboleth.yml
	stacks/stack_registry