New merge branch, without my changes - DO NOT MERGE!

This basically reverts the changes I made to the activation process, and replays recent changes back on top of that. 

Here are the files that were causing conflicts when I revered:
```bash
default_settings.py
mypartners/models.py
mypartners/tests/test_models.py
mypartners/tests/test_views.py
mysearches/tests/test_models.py
requirements.txt
tasks.py
templates/base.html
templates/mypartners/includes/partner_card.html
templates/mypartners/partner_library.html
universal/helpers.py
```

I manually inspected and adjusted each of those, but a second eye couldn't hurt. Merging this will cause those regressions to be reintroduced, so we should instead delete the merge branch and use this one instead. 

All tests pass (including the celery stuff, which I cherry-picked).