Merge branch 'master' into pyup-pin-datadiff-2.0.0

Author: ericholscher

requirements/deploy.txt

@@ -5,4 +5,4 @@ gunicorn==19.9.0
 django-redis-cache==1.8.1
 
 #For resizing images
-pillow
+pillow==5.4.1

requirements/pip.txt

@@ -48,7 +48,7 @@ httplib2==0.12.0
 GitPython==2.1.10  # pyup: ignore
 
 # Search
-elasticsearch==6.2.0
+elasticsearch==6.3.1
 
 
 # elasticsearch-dsl==6.3.1 produces this error

requirements/testing.txt

@@ -5,7 +5,7 @@ django-dynamic-fixture==2.0.0
 pytest==4.2.0
 pytest-django==3.4.7
 pytest-xdist==1.26.1
-pytest-cov
+pytest-cov==2.6.1
 apipkg==1.5
 execnet==1.5.0
 
@@ -22,4 +22,4 @@ pytest-mock==1.10.1
 
 # local debugging tools
 datadiff==2.0.0
-ipdb
+ipdb==0.11