restore old rule deletions to card migration
final cleanup before wikirate live deploy.  migration tweak, flexmail removal
Merge branch 'master' into wikirate