From 0a3c59daf87c104c21b4b114dc9d1a1a6b8f0be9 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Wed, 13 Mar 2013 16:54:01 -0400
Subject: [PATCH] Don't use devserver

---
 SETUP.md                 | 5 ++---
 lib/settings/defaults.py | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SETUP.md b/SETUP.md
index 6f2914cc57..be4a05dbcc 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -18,9 +18,8 @@ You will also need the EPEL yum repository installed if using CentOS6.
 
 First edit app_setup/vars/vars.yml to select a database password.
 
-If you feel like you need to change it, the Django config file is also 
-templated.  See app_setup/templates/setting.py.j2.  Most people will
-not need to change this.
+Edit your local settings in app-setup/templates/local_settings.py.j2
+as desired.
 
 run "make setup" to run the ansible setup playbook.  It should run
 without erros.
diff --git a/lib/settings/defaults.py b/lib/settings/defaults.py
index 1b91f361b0..5b07b47a36 100644
--- a/lib/settings/defaults.py
+++ b/lib/settings/defaults.py
@@ -103,7 +103,8 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'lib.main',
     'south',
-    'devserver',
+# not yet compatible with Django 1.5 unless using version from github
+#   'devserver',
     'tastypie',
     'django_extensions',
 )