updated to latest versions and merged between branches

requirements.txt

@@ -1,17 +1,22 @@
 Django>=1.11,<2.0
 Pillow==4.1.1
 psycopg2==2.7.1
-django-localflavor==1.5
+django-localflavor==1.5.1
 django-localflavor-us==1.1
 django-taggit==0.22.1
 django-taggit-templatetags2==1.6.1
 django-crontab==0.7.1
 mailchimp==2.0.9
-requests==2.17.3
 cryptography==1.9
 suds-jurko==0.6
 python-slugify==1.2.4
 
+# Should remain unversioned
+pytz
+requests
+setuptools
+gunicorn
+
 # For document signing & PDFs
 html5lib==1.0b10
 django-jsignature==0.8
@@ -26,11 +31,15 @@ pyxero==0.8.0
 PyJWT==1.5.0
 
 # Libraries for Arpwatch
-pysnmp==4.3.7
+pysnmp==4.3.8
 pysnmp-mibs==0.1.6
 
 # For the documentation:
 sphinx==1.6.2
 sphinx-rtd-theme==0.2.4
 recommonmark==0.4.0
 pycodestyle==2.3.1
+
+# A few handy tools
+django-debug-toolbar
+pip-review