require Disaster when registering, fixes #352#397

mcotton wants to merge 3 commits intoCrisisCleanup:masterCrisisCleanup/crisiscleanup-2:masterfrom

mcotton:mastermcotton/crisiscleanup:masterCopy head branch name to clipboard