diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index d54920728fb31458f464a52be5e183e564ef4531..898da78e4ccf1e7b76e1d121029dd746133ddb57 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -132,11 +132,14 @@ TEMPLATES = [
                 "account.context_processors.account",
                 "pinax_theme_bootstrap.context_processors.theme",
                 "symposion.reviews.context_processors.reviews",
+                "sekizai.context_processors.sekizai",
             ],
         },
     },
 ]
 
+TEMPLATE_DEBUG = False
+
 MIDDLEWARE_CLASSES = [
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
@@ -212,6 +215,18 @@ INSTALLED_APPS = [
     #testing
     "django_nose",
 
+    # wiki
+    'django.contrib.humanize',
+    'django_nyt',
+    'mptt',
+    'sekizai',
+    'sorl.thumbnail',
+    'wiki',
+    'wiki.plugins.attachments',
+    'wiki.plugins.notifications',
+    'wiki.plugins.images',
+    'wiki.plugins.macros',
+
     # stylesheets and js
     'compressor',
 ]
@@ -309,6 +324,13 @@ TICKET_PRODUCT_CATEGORY = 1
 
 INVOICE_CURRENCY = "USD"
 
+WIKI_ACCOUNT_HANDLING = False
+WIKI_ACCOUNT_SIGNUP_ALLOWED = False
+
+WIKI_ANONYMOUS_WRITE = False
+WIKI_ANONYMOUS_UPLOAD = False
+
+
 # Use nose to run all tests
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html
index 2c8013c2b5b1df756a4a80903e3fdb1208202b6d..4754147ed39dcefc8be7177569715887a0687310 100644
--- a/pinaxcon/templates/_footer.html
+++ b/pinaxcon/templates/_footer.html
@@ -24,6 +24,7 @@
     <p>
       <a href="https://facebook.com/northbaypython">Facebook</a>
       | <a href="https://twitter.com/northbaypython">Twitter</a>
+      | <a href="/accessibility">Accessibility</a>
       | <a href="/code-of-conduct">Code of Conduct</a>
       | <a href="/terms">Terms and Conditions</a>
       | <a href="/about/colophon">Colophon</a>
diff --git a/pinaxcon/templates/static_pages/attend/hotels.html b/pinaxcon/templates/static_pages/attend/hotels.html
index adca8b6fb5c2fce2b0baa9672de8c3b6c005f5e4..f5f56ebb25c479d17c835a2083027a83a6e4a887 100644
--- a/pinaxcon/templates/static_pages/attend/hotels.html
+++ b/pinaxcon/templates/static_pages/attend/hotels.html
@@ -36,7 +36,7 @@
 
 <p>The only hotel in Downtown Petaluma is a recently renovated boutique hotel in a 1920s-era building. It's a short walk from North Bay Python's venue, and is close to Petaluma's best places to eat and drink.</p>
 
-<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link by November 1st.</p>
+<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link.</p>
 
 <h3>Sheraton Petaluma</h3>
 
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index a936b8b4b0259fbc918f2ca3d1b37d1360c0f2aa..2439614d6d596cfcfe48664fac104bc9b77a3853 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -4,6 +4,8 @@ from django.conf.urls.static import static
 from django.contrib.staticfiles.templatetags.staticfiles import static as _static
 from django.views.generic import TemplateView
 from django.views.generic import RedirectView
+from django_nyt.urls import get_pattern as get_nyt_pattern
+from wiki.urls import get_pattern as get_wiki_pattern
 
 from django.contrib import admin
 
@@ -85,10 +87,14 @@ urlpatterns = [
     url(r'^tickets/', include('registrasion.urls')),
     url(r'^nested_admin/', include('nested_admin.urls')),
 
+    url(r'^wiki/notifications/', get_nyt_pattern()),
+    url(r'^wiki/', get_wiki_pattern())
+
     # Catch-all MUST go last.
     #url(r"^", include("pinax.pages.urls")),
 ]
 
+
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 handler500 = views.server_error
diff --git a/requirements/base.txt b/requirements/base.txt
index cd7a6500e448a856d7a542445ec4c67e558c9e0c..94f429e82e3ffe530849e51bfb7e938515b795c6 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -17,6 +17,7 @@ django-countries==4.6.1
 easy-thumbnails==2.4.1
 django-timezone-field==2.0
 django-model-utils==3.0.0
+wiki==0.3b3
 
 
 # For testing