diff --git a/docs/en_us/developers/source/pavelib.rst b/docs/en_us/developers/source/pavelib.rst
index bdd52907a5..3bb3467e7f 100644
--- a/docs/en_us/developers/source/pavelib.rst
+++ b/docs/en_us/developers/source/pavelib.rst
@@ -69,7 +69,7 @@ Assets will compile Sass (CSS), CoffeeScript (Javascript) and XModule assets. Op
 
     *system* lms or studio
 
-    *--settings=* Django settings e.g. aws, dev
+    *--settings=* Django settings e.g. aws, dev, devstack (the default)
 
     *--debug* Disable Sass compression
 
@@ -88,7 +88,7 @@ Run Servers
 
     **lms**: runs LMS server
 
-     *--settings=* Django settings e.g. aws, dev
+     *--settings=* Django settings e.g. aws, dev, devstack (the default)
 
      *--fast*   Skip updating assets
 
@@ -101,7 +101,7 @@ Run Servers
 
     **studio**: runs Studio
 
-     *--settings=* Django settings e.g. aws, dev
+     *--settings=* Django settings e.g. aws, dev, devstack (the default)
 
      *--fast*   Skip updating assets
 
@@ -109,24 +109,12 @@ Run Servers
 
    paver studio --settings=dev
 
-..
-
-    **devstack**: runs LMS or Studio (for use within a Vagrant devstack VM)
-
-     *system*   LMS or Studio
-
-     *--fast*   Skip updating assets
-
-::
-
-   paver devstack lms
-
 ..
 
 
     **run_all_servers**: runs lms, cms and celery workers
 
-     *--settings=* Django settings e.g. aws, dev
+     *--settings=* Django settings e.g. aws, dev, devstack (the default)
 
      *--worker_settings=* Django settings for celery workers
 
@@ -142,7 +130,7 @@ Run Servers
 
      *--settings=* Environment settings e.g. aws, dev both for LMS and Studio
 
-     *--settings_lms=* Override django settings for LMS e.g. cms.dev
+     *--settings_lms=* Override django settings for LMS e.g. lms.dev
 
      *--settings_cms=* Override django settings for Studio
 
@@ -155,7 +143,7 @@ Run Servers
 
     **update_db**: runs syncdb and then migrate
 
-     *--settings=* Django settings e.g. aws, dev
+     *--settings=* Django settings e.g. aws, dev, devstack (the default)
 
 ::
 
diff --git a/docs/en_us/install_operations/source/devstack/run_devstack.rst b/docs/en_us/install_operations/source/devstack/run_devstack.rst
index af54cada6a..89af489740 100644
--- a/docs/en_us/install_operations/source/devstack/run_devstack.rst
+++ b/docs/en_us/install_operations/source/devstack/run_devstack.rst
@@ -88,13 +88,13 @@ To run the LMS on Devstack:
    
    .. code-block:: bash
 
-    paver devstack lms
+    paver lms
 
    Or, to start the LMS without updating requirements and compiling assets, use the ``fast`` option:
    
    .. code-block:: bash
 
-    paver devstack --fast lms 
+    paver lms --fast 
 
    The LMS starts. 
 
@@ -120,14 +120,14 @@ To run Studio on Devstack:
    
    .. code-block:: bash
 
-    paver devstack studio
+    paver studio
 
    Or, to start Studio without updating requirements and compiling assets, use
    the ``fast`` option:
    
    .. code-block:: bash
 
-    paver devstack --fast studio 
+    paver studio --fast 
 
    Studio starts. 
 
diff --git a/pavelib/assets.py b/pavelib/assets.py
index 698936b26e..792997404f 100644
--- a/pavelib/assets.py
+++ b/pavelib/assets.py
@@ -207,7 +207,7 @@ def update_assets(args):
         help="lms or studio",
     )
     parser.add_argument(
-        '--settings', type=str, default="dev",
+        '--settings', type=str, default="devstack",
         help="Django settings module",
     )
     parser.add_argument(
diff --git a/pavelib/servers.py b/pavelib/servers.py
index 9f2c176cba..8fe31a511b 100644
--- a/pavelib/servers.py
+++ b/pavelib/servers.py
@@ -10,7 +10,7 @@ from .utils.process import run_process, run_multi_processes
 
 
 DEFAULT_PORT = {"lms": 8000, "studio": 8001}
-DEFAULT_SETTINGS = 'dev'
+DEFAULT_SETTINGS = 'devstack'
 
 
 def run_server(system, settings=None, port=None, skip_assets=False):
@@ -25,6 +25,9 @@ def run_server(system, settings=None, port=None, skip_assets=False):
         print("System must be either lms or studio", file=sys.stderr)
         exit(1)
 
+    if not settings:
+        settings = DEFAULT_SETTINGS
+
     if not skip_assets:
         # Local dev settings use staticfiles to serve assets, so we can skip the collecstatic step
         args = [system, '--settings={}'.format(settings), '--skip-collect', '--watch']
@@ -33,9 +36,6 @@ def run_server(system, settings=None, port=None, skip_assets=False):
     if port is None:
         port = DEFAULT_PORT[system]
 
-    if settings is None:
-        settings = DEFAULT_SETTINGS
-
     run_process(django_cmd(
         system, settings, 'runserver', '--traceback',
         '--pythonpath=.', '0.0.0.0:{}'.format(port)))
@@ -78,6 +78,7 @@ def studio(options):
 @task
 @needs('pavelib.prereqs.install_prereqs')
 @consume_args
+@no_help
 def devstack(args):
     """
     Start the devstack lms or studio server
@@ -115,7 +116,7 @@ def run_all_servers(options):
     """
     Runs Celery workers, Studio, and LMS.
     """
-    settings = getattr(options, 'settings', 'dev')
+    settings = getattr(options, 'settings', DEFAULT_SETTINGS)
     settings_lms = getattr(options, 'settings_lms', settings)
     settings_cms = getattr(options, 'settings_cms', settings)
     worker_settings = getattr(options, 'worker_settings', 'dev_with_worker')
@@ -145,7 +146,7 @@ def update_db():
     """
     Runs syncdb and then migrate.
     """
-    settings = getattr(options, 'settings', 'dev')
+    settings = getattr(options, 'settings', DEFAULT_SETTINGS)
     sh(django_cmd('lms', settings, 'syncdb', '--traceback', '--pythonpath=.'))
     sh(django_cmd('lms', settings, 'migrate', '--traceback', '--pythonpath=.'))