diff --git a/.travis.yml b/.travis.yml
index 6c19d753..14a03947 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 
 python:
-  - '2.7'
+  - '3.6'
 
 services:
   - redis-server
@@ -20,6 +20,6 @@ before_install:
   - openssl aes-256-cbc -K $encrypted_690265ba1262_key -iv $encrypted_690265ba1262_iv -in ~/build/Gluejar/regluit/test/travis-host.py.enc -out ~/build/Gluejar/regluit/settings/keys/host.py -d
 
 install: 
-  - pip install -r requirements_versioned.pip
+  - pip install -r requirements.txt
 
 script: django-admin test
diff --git a/Pipfile b/Pipfile
index 6d119629..7c07e052 100644
--- a/Pipfile
+++ b/Pipfile
@@ -40,6 +40,7 @@ selenium = "*"
 boto3 = "*"
 requests-mock = "*"
 django-notification = {editable = true,git = "git://github.com/eshellman/django-notification.git",ref = "41f0a7bdd9af835adfb27a26a0d9536f083ad568"}
+redis = "*"
 
 [requires]
 python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
index a27fd1a3..36f8136c 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "8bb28d6a5159b1545f2915466363a89917323737d0e21477cafda96c2db0fd05"
+            "sha256": "3fd6801bd7a2ceb64c205bd879cc0b647e39e6a5be076923d2a8e5a827e15744"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -59,19 +59,19 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:33462a79d57c9c4a215e075472509537d03545f54566fc4f776fb0f4cfa616f6",
-                "sha256:34f9a04f529dc849f0e427782d6f3c6b62f7fb734d8f4859b17e5dee0855323e"
+                "sha256:666bbcc7616b79e35d4ecb5fea3624d7812ec9d0bff13919501942af9e836d23",
+                "sha256:f1d5be915b806bd4335757040fb9741587b4b72bb85b9ee2fe91fe1d1655aa69"
             ],
             "index": "pypi",
-            "version": "==1.12.0"
+            "version": "==1.12.1"
         },
         "botocore": {
             "hashes": [
-                "sha256:055da4826f6c9158e4a61549d57a2ce449c27d44ce34ab4c96c7bb7b5c993efc",
-                "sha256:1f7cecfcd38c7cac17b5386014eb04626d1c7559ee8d8ec1526058cd23f6d1d4"
+                "sha256:5cd1076e953eac0d2da3d499d8b6641e85fe62abe4ad9e40298b6826a3e95bcb",
+                "sha256:7f533d7ffcf4c3655bb2b37d6dbd2b067ba06074b9f186d66e8d6fcb90812987"
             ],
             "index": "pypi",
-            "version": "==1.15.0"
+            "version": "==1.15.1"
         },
         "cairocffi": {
             "hashes": [
@@ -747,6 +747,14 @@
             ],
             "version": "==0.4.0"
         },
+        "redis": {
+            "hashes": [
+                "sha256:0dcfb335921b88a850d461dc255ff4708294943322bd55de6cfd68972490ca1f",
+                "sha256:b205cffd05ebfd0a468db74f0eedbff8df1a7bfc47521516ade4692991bb0833"
+            ],
+            "index": "pypi",
+            "version": "==3.4.1"
+        },
         "reportlab": {
             "hashes": [
                 "sha256:2a1c4ea2155fd5b6e3f89e36b8aa21b5a14c9bbaf9b44de2787641668bc95edc",
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..55cd9bb4
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,110 @@
+-i https://pypi.org/simple
+-e git+git://github.com/EbookFoundation/fef-questionnaire.git@6b4aafe2b26575ef23c48d7704d59abd4799d5f5#egg=fef-questionnaire
+-e git+git://github.com/eshellman/django-email-change.git@830808b9b9db5f3ca9ec0cb22f8fda5cc2cef12d#egg=django-email-change
+-e git+git://github.com/eshellman/django-notification.git@41f0a7bdd9af835adfb27a26a0d9536f083ad568#egg=django-notification
+amqp==1.4.9
+anyjson==0.3.3
+appdirs==1.4.3
+beautifulsoup4==4.8.2
+billiard==3.3.0.23
+boto3==1.12.1
+botocore==1.15.1
+cairocffi==0.8.0
+celery==3.1.26.post2
+certifi==2019.11.28
+cffi==1.14.0
+chardet==3.0.4
+confusable-homoglyphs==3.2.0
+cryptography==2.8
+defusedxml==0.6.0 ; python_version >= '3.0'
+distlib==0.3.0
+django-celery==3.2.2
+django-ckeditor==5.6.1
+django-compat==1.0.15
+django-contrib-comments==1.9.2
+django-el-pagination==3.2.4
+django-extensions==2.2.8
+django-js-asset==1.2.2
+django-jsonfield==1.0.0
+django-mptt==0.8.6
+django-registration==2.4.1
+django-sass-processor==0.5.6
+django-selectable==1.1.0
+django-storages==1.5.2
+django-tastypie==0.14.1
+django-transmeta-eh==0.7.6
+django==1.11.28
+docopt==0.6.2
+docutils==0.15.2
+filelock==3.0.12
+gitberg==0.7.2
+gitdb2==3.0.2
+github3-py==1.3.0
+github3.py==1.3.0
+gitpython==3.0.8
+html5lib==1.0.1
+httplib2==0.17.0
+idna==2.8
+importlib-metadata==1.5.0 ; python_version < '3.8'
+importlib-resources==1.0.2 ; python_version < '3.7'
+isodate==0.6.0
+jinja2==2.11.1
+jmespath==0.9.4
+jwcrypto==0.6.0
+kombu==3.0.37
+libsass==0.19.4
+lxml==4.5.0
+mailchimp3==3.0.4
+markupsafe==1.1.1
+mechanize==0.4.5
+mock==2.0.0
+mysqlclient==1.4.6
+oauth2==1.9.0.post1
+oauthlib==3.1.0
+packaging==20.1
+pbr==5.4.4
+pillow==7.0.0
+pluggy==0.13.1
+py==1.8.1
+pycparser==2.19
+pyepub==0.5.0
+pyjwt==1.7.1
+pymarc==3.2.0
+pyoai==2.5.0
+pyopenssl==19.1.0
+pyparsing==2.4.6
+pypdf2==1.26.0
+python-dateutil==2.8.1
+python-mimeparse==1.6.0
+python3-openid==3.1.0 ; python_version >= '3.0'
+pytz==2019.3
+pyyaml==5.3
+rdflib-jsonld==0.4.0
+rdflib==4.2.2
+redis==3.4.1
+reportlab==3.5.34
+requests-mock==1.7.0
+requests-oauthlib==1.3.0
+requests==2.22.0 ; python_version >= '3.0'
+risparser==0.4.3
+s3transfer==0.3.3
+selenium==3.141.0
+semver==2.2.0
+sh==1.12.14
+six==1.14.0
+smmap2==2.0.5
+social-auth-app-django==2.1.0
+social-auth-core==3.2.0
+sorl-thumbnail==12.3
+soupsieve==1.9.5
+sparqlwrapper==1.6.4
+stripe==2.42.0
+toml==0.10.0
+tox==3.14.5
+uritemplate==3.0.1
+urllib3==1.25.8 ; python_version != '3.4'
+virtualenv==20.0.4
+webencodings==0.5.1
+wikipedia==1.4.0
+xhtml2pdf==0.2.4
+zipp==3.0.0
diff --git a/requirements_versioned.pip b/requirements_versioned.pip
deleted file mode 100644
index 16ef4278..00000000
--- a/requirements_versioned.pip
+++ /dev/null
@@ -1,119 +0,0 @@
-Django==1.11.14
-Fabric==1.6.0
-GitPython>=2.1.8
-Jinja2>=2.7
-MySQL-python==1.2.5
-Pillow==3.4.2
-PyJWT==1.4.1
-#PyPDF2==1.26
-git+git://github.com/mstamy2/PyPDF2.git@18a2627adac13124d4122c8b92aaa863ccfb8c29
-PyGithub==1.15.0
-PyYAML==3.13
-amqp==1.4.9
-anyjson==0.3.3
-appdirs==1.4.0
-billiard==3.3.0.23
-awscli>=1.15.52
-boto==2.49.0
-boto3==1.9.167
-celery==3.1.23
-certifi==2019.3.9
-chardet==3.0.4
-# pip installing pillow seems to delete distribute
-# but having distribute in requirements starting to cause problems
-# distribute==0.6.28
-docopt>=0.6
-django-celery==3.2.2
-django-ckeditor==5.6.1
-#django-email-change==0.2.3
-git+git://github.com/eshellman/django-email-change.git@830808b9b9db5f3ca9ec0cb22f8fda5cc2cef12d
-django-compat==1.0.15
-django-contrib-comments==1.8.0
-django-el-pagination==3.2.4
-django-extensions==1.6.1
-django-jsonfield==1.0.0
-#django-kombu==0.9.4
-django-mptt==0.8.6
-#django-notification==0.2
-git+git://github.com/eshellman/django-notification.git@92cc14b737d4a10e7e866b2f467ef1f20a89c715
-django-registration==2.4.1
-django-selectable==1.1.0
-django-smtp-ssl==1.0
-django-storages==1.5.2
-django-tastypie==0.14.1
-#django-transmeta==0.7.3 
-git+git://github.com/resulto/django-transmeta.git@ad4d7278ba330dcf8c8446f8ae9b2c769ae8684e
-#fef-questionnaire==4.0.1
-git+git://github.com/EbookFoundation/fef-questionnaire.git@8c3b630eb6171fe9242bf0d3b456dc41de958006
-gitberg>=0.6.1
-github3.py>=1.0.0
-html5lib==1.0.1
-httplib2==0.11.3
-isodate==0.6.0
-kombu==3.0.37
-lxml==4.2.1
-defusedxml==0.4.1
-mechanize==0.2.5
-mimeparse==0.1.3
-nose==1.1.2
-numpy==1.11.2
-oauth2==1.9.0.post1
-oauthlib==1.1.2
-pandas==0.19.1
-paramiko==1.14.1
-mailchimp3==3.0.4
-pycrypto==2.6
-pyepub==0.3.2
-pymarc==3.0.3
-pyoai==2.5.0
-pyparsing==2.3.0
-python-dateutil>=2.6.0
-python-mimeparse==0.1.4
-python-openid==2.2.5
-social-auth-core==1.7.0
-social-auth-app-django==2.1.0
-pytz>=2016.6.1
-rdflib==4.2.2
-rdflib-jsonld==0.4.0
-redis==2.10.3
-reportlab==3.4.0
-requests>=2.20.0
-requests-mock==1.2.0
-requests-oauthlib==0.6.2
-selenium==2.53.1
-semver==2.2.0
-sh>=1
-six==1.11.0
-sorl-thumbnail==12.3
-SPARQLWrapper==1.6.4
-ssh==1.7.14
-stevedore==1.12.0
-stripe==1.9.1
-tox>=2.5.0
-uritemplate.py>=0.3.0
-virtualenv>=1.4.9
-# virtualenv-clone==0.2.4 not sure why I have this in my env
-#virtualenvwrapper==3.6
-wsgiref==0.1.2
-xhtml2pdf==0.2.2
-webencodings==0.5.1
-wikipedia==1.4.0
-#for urllib3 secure
-cffi>=1.9.1
-cairocffi==0.8.0
-cryptography==2.2.2
-enum34==1.1.6
-idna==2.6
-ipaddress==1.0.16
-ndg-httpsclient==0.5.1
-pyOpenSSL==18.0.0
-pyasn1>=0.4.2
-pycparser>=2.17
-setuptools==25.0.0
-urllib3==1.22
-beautifulsoup4==4.6.0
-RISparser==0.4.2
-# include these 2 for development
-#libsass==0.13.4
-#django-compressor==2.2
-django-sass-processor==0.5.6