Add active flag check on rewrites
Merge branch 'master' of https://github.com/magento-hackathon/MailGuard