Merge branch 'master' into intarnet

requirements/base.txt

@@ -1,6 +1,5 @@
 Django>=1.11,<2
 PyYAML>=3.11,<4.0
 django-request-token>=0.6,<0.7
-django-debug-toolbar
 pytz
 sqlparse

requirements/dev.txt

@@ -1,2 +1,3 @@
 -r base.txt
+django-debug-toolbar
 freezegun

wifiwithme/settings/base.py

@@ -136,9 +136,6 @@ STATICFILES_DIRS = [
 
 NOTIFICATION_EMAILS = []
 
-SITE_URL = 'http://example.com/wifi'
-
-
 # Data expiration warning
 
 DATA_EXPIRATION_REMINDERS = [