Improve activate

This will harm production unless `activate` is removed from production.

This can be merged now that https://github.com/scraperwiki/salt-data/pull/141 is merged (which removes `activate` from production).