diff --git a/settings2/dev.py b/settings2/dev.py
index 48c512266b..5fcc188f97 100644
--- a/settings2/dev.py
+++ b/settings2/dev.py
@@ -5,7 +5,7 @@ sessions. Assumes structure:
 /envroot/
         /db   # This is where it'll write the database file
         /mitx # The location of this repo
-
+        /log  # Where we're going to write log files
 """
 from common import *
 
@@ -19,13 +19,31 @@ DATABASES = {
     }
 }
 
-# This is disabling ASKBOT, but not properly overwriting INSTALLED_APPS. ???
-# It's because our ASKBOT_ENABLED here is actually shadowing the real one.
-# 
-# ASKBOT_ENABLED = True
-# MITX_FEATURES['SAMPLE'] = True  # Switch to this system so we get around the shadowing
+CACHES = {
+    # This is the cache used for most things. Askbot will not work without a 
+    # functioning cache -- it relies on caching to load its settings in places.
+    # In staging/prod envs, the sessions also live here.
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'mitx_loc_mem_cache'
+    },
 
-# Add the debug toolbar...
+    # The general cache is what you get if you use our util.cache. It's used for
+    # things like caching the course.xml file for different A/B test groups.
+    # We set it to be a DummyCache to force reloading of course.xml in dev.
+    # In staging environments, we would grab VERSION from data uploaded by the
+    # push process.
+    'general': {
+        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+        'KEY_PREFIX': 'general',
+        'VERSION': 4,
+    }
+}
+
+# Dummy secret key for dev
+SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
+
+################################ DEBUG TOOLBAR #################################
 INSTALLED_APPS += ('debug_toolbar',) 
 MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 INTERNAL_IPS = ('127.0.0.1',)
@@ -42,7 +60,7 @@ DEBUG_TOOLBAR_PANELS = (
 #  'debug_toolbar.panels.profiling.ProfilingDebugPanel', # Lots of overhead
 )
 
-# Storage for uploaded files (askbot file uploads at the moment)
+############################ FILE UPLOADS (ASKBOT) #############################
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
 MEDIA_ROOT = ENV_ROOT / "uploads"
 MEDIA_URL = "/discussion/upfiles/"
@@ -51,24 +69,3 @@ FILE_UPLOAD_HANDLERS = (
     'django.core.files.uploadhandler.MemoryFileUploadHandler',
     'django.core.files.uploadhandler.TemporaryFileUploadHandler',
 )
-
-CACHES = {
-    # This is the cache used for most things. Askbot will not work without a 
-    # functioning cache -- it relies on caching to load its settings in places.
-    # In staging/prod envs, the sessions also live here.
-    'default': {
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        'LOCATION': 'mitx_loc_mem_cache'
-    },
-
-    # The general cache is what you get if you use our util.cache. It's used for
-    # things like caching the course.xml file for different A/B test groups.
-    # We set it to be a DummyCache to force reloading of course.xml in dev.
-    'general': {
-        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
-        'KEY_PREFIX': 'general',
-    }
-}
-
-# Dummy secret key for dev
-SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'