diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..8fef8a710d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+setup:
+	ansible-playbook app_setup/setup.yml -i "127.0.0.1," -c local -e working_dir=`pwd`
+
+syncdb:
+	python acom/manage.py syncdb
+
+runserver:
+	python acom/manage.py runserver
+
+# already done and should not have to happen again:
+#
+#south_init:
+#	PYTHON_PATH=./acom python acom/manage.py schemamigration main --initial
+
+dbchange:
+	PYTHON_PATH=./acom python acom/manage.py schemamigration main --auto
+
+migrate:
+	PYTHON_PATH=./acom python acom/manage.py migrate main --auto
+
+test:
+	PYTHON_PATH=./acom python acom/manage.py test main
+         
diff --git a/acom/main/tests.py b/acom/main/tests.py
index 2247054b35..074bdc3781 100644
--- a/acom/main/tests.py
+++ b/acom/main/tests.py
@@ -9,15 +9,6 @@ from django.test import TestCase
 
 class SimpleTest(TestCase):
     def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
         self.failUnlessEqual(1 + 1, 2)
 
-__test__ = {"doctest": """
-Another way to test that 1 + 1 is equal to 2.
-
->>> 1 + 1 == 2
-True
-"""}
 
diff --git a/acom/settings.pyc b/acom/settings.pyc
index c24372f364..a0133886f0 100644
Binary files a/acom/settings.pyc and b/acom/settings.pyc differ
diff --git a/app_setup/setup.yml b/app_setup/setup.yml
index d490a03c89..4b050a781b 100644
--- a/app_setup/setup.yml
+++ b/app_setup/setup.yml
@@ -60,7 +60,7 @@
         django_manage: >
           command=syncdb
           app_path=${working_dir}/acom
- 
-      #- name: run south migrations
-      #  command: python ${working_dir}/acom/manage.py migrate db_migrate
+
+      - name: run south migrations
+        command: python ${working_dir}/acom/manage.py migrate main
 
diff --git a/app_setup/templates/settings.py.j2 b/app_setup/templates/settings.py.j2
index 486821bc30..5c90dba074 100644
--- a/app_setup/templates/settings.py.j2
+++ b/app_setup/templates/settings.py.j2
@@ -1,5 +1,7 @@
 # Django settings for acom project.
 
+import sys
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -20,6 +22,11 @@ DATABASES = {
     }
 }
 
+if 'test' in sys.argv:
+    DATABASES['default'] = {
+        'ENGINE': 'django.db.backends.sqlite3'
+    }
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.