diff --git a/.bzrignore b/.bzrignore
index 03f01515d..d133e1f64 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,3 +1,9 @@
+django-nova/.installed.cfg
+django-nova/bin
+django-nova/develop-eggs/
+django-nova/downloads/
+django-nova/eggs/
+django-nova/parts/
 django-nova/src/django_nova.egg-info
 openstack-dashboard/.dashboard-venv
 openstack-dashboard/local/dashboard_openstack.sqlite3
diff --git a/README b/README
index e69de29bb..c1930bfe8 100644
--- a/README
+++ b/README
@@ -0,0 +1,14 @@
+OpenStack Dashboard
+-------------------
+
+The OpenStack Dashboard is a Django based reference implementation of a web
+based managent interface for OpenStack Nova.
+
+It is based on django-nova, which is designed to be a generic Django module
+that can be re-used in other sites.
+
+For more information about how to get started with the OpenStack Dashboard,
+view the README file in the openstack-dashboard folder.
+
+For more information about working directly with django-nova, see the
+README file in the django-nova folder.
diff --git a/openstack-dashboard/README b/openstack-dashboard/README
index 3856aca71..302277bef 100644
--- a/openstack-dashboard/README
+++ b/openstack-dashboard/README
@@ -5,24 +5,12 @@ The OpenStack Dashboard is a reference implementation of a Django site that
 uses the Django-Nova project to provide web based interactions with the
 OpenStack Nova cloud controller.
 
-For more information about the Django-Nova project, please visit:
-
-  http://launchpad.net/django-nova
-
 
 Getting Started
 ---------------
 
-The first step is to obtain a local copy of the django-nova project:
-
-  $ mkdir django-nova
-  $ cd django-nova
-  $ bzr init-repo .
-  $ bzr branch lp:django-nova/trunk
-
-
-Next we will create the virtualenv for local development. A tool is included to
-create one for you:
+For local development, first create a virtualenv for local development.
+A tool is included to create one for you:
 
   $ python tools/install_venv.py
 
diff --git a/openstack-dashboard/local/local_settings.py.example b/openstack-dashboard/local/local_settings.py.example
index 95631bc20..888927ea6 100644
--- a/openstack-dashboard/local/local_settings.py.example
+++ b/openstack-dashboard/local/local_settings.py.example
@@ -15,6 +15,12 @@ DATABASES = {
 
 CACHE_BACKEND = 'dummy://'
 
+# Configure these for your outgoing email host
+# EMAIL_HOST = 'smtp.my-company.com'
+# EMAIL_PORT = 25
+# EMAIL_HOST_USER = 'djangomail'
+# EMAIL_HOST_PASSWORD = 'top-secret!'
+
 NOVA_DEFAULT_ENDPOINT = 'http://localhost:8773/services/Cloud'
 NOVA_DEFAULT_REGION = 'nova'
 NOVA_ACCESS_KEY = 'admin'
diff --git a/openstack-dashboard/run_tests.sh b/openstack-dashboard/run_tests.sh
deleted file mode 100755
index 38499f090..000000000
--- a/openstack-dashboard/run_tests.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-bzr branch lp:django-nova
-python tools/install_venv.py django-nova
-
-cp local/local_settings.py.example local/local_settings.py
-tools/with_venv.sh dashboard/manage.py  test
diff --git a/run_tests.sh b/run_tests.sh
new file mode 100755
index 000000000..b34a98314
--- /dev/null
+++ b/run_tests.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cd django-nova
+python bootstrap.py
+bin/buildout
+bin/test
+
+cd ../openstack-dashboard
+python tools/install_venv.py
+
+cp local/local_settings.py.example local/local_settings.py
+tools/with_venv.sh dashboard/manage.py test