Merge branch 'feature/test-db-settings' of https://github.com/takeflight/wagtail into takeflight-feature/test-db-settings

Conflicts:
	runtests.py

runtests.py

@@ -3,7 +3,6 @@ import sys
 import os
 import shutil
 
-from django.conf import settings
 from django.core.management import execute_from_command_line
 
 from wagtail.tests.settings import STATIC_ROOT, MEDIA_ROOT

wagtail/tests/settings.py

@@ -11,8 +11,9 @@ MEDIA_ROOT = os.path.join(WAGTAIL_ROOT, 'test-media')
 DATABASES = {
     'default': {
         'ENGINE': os.environ.get('DATABASE_ENGINE', 'django.db.backends.postgresql_psycopg2'),
-        'NAME': 'wagtaildemo',
+        'NAME': os.environ.get('DATABASE_NAME', 'wagtaildemo'),
         'USER': os.environ.get('DATABASE_USER', 'postgres'),
+        'PASSWORD': os.environ.get('DATABASE_PASS', None),
     }
 }