Revert "Revert "Merge pull request #101 from dimagi/cleanup-is_excluded""

This reverts commit 261deff2308d49c36c69fd18630ba3f607968bd3.