Merge pull request #982 from andymckay/848868

encrypt the oauth token (bug 848868)
Revert "Merge pull request #982 from andymckay/848868"

This reverts commit 7e73feefc6d0bc58525a3daa05a42a87437550ca, reversing
changes made to 3e949326daa07b0c4873f185e79da2072ab08de8.
Add region/category/carrier filtering on Collections (bug 903489)

Also, implement dynamic filters fallback : if the current set of
filters don't return results, remove one and try again till we have
exausted available filters or we have found some results.

django-filter 0.7 upgrade is necessary to fix a bug regarding filtering
on '0' values.
Merge pull request #981 from diox/collections-region-category-carrier

Add region/category/carrier filtering on Collections (bug 903489)
Add "Author Name" to collections (bug 903168)
Merge pull request #997 from diox/collection-author

Add "Author Name" to collections (bug 903168)
Fix rocketfuel docs
Add collection filter parameters to the API docs
Fix collections tests by testing the FK to Category differently & separately
Fix typo in collections docs
Add a test to make sure we can set NULL values for Collections (bug 894645)
Merge pull request #1001 from diox/collections-remove-region

Add a test to make sure we can set NULL values for Collections (bug 894645)
back out theme stats cron, celery being filled up
have "Queue" link to actual queue instead of "#"
make the MOTD design less horrifying
encrypt the oauth token (bug 848868)