diff --git a/bin/detect b/bin/detect
index 64b4a5e30ddf400a10a33732f921b08d4771e982..dd1877f9788e9c1566590681d6ee251b09c53eb1 100755
--- a/bin/detect
+++ b/bin/detect
@@ -3,9 +3,20 @@
 
 BUILD_DIR=$1
 
+# Exit early if app is clearly not Python.
 if [ ! -f $BUILD_DIR/requirements.txt ] && [ ! -f $BUILD_DIR/setup.py ]; then
   exit 1
 fi
 
-# 'Python/Django' if there is a [mysite]/settings.py file present; otherwise 'Python'
-ls $BUILD_DIR/**/settings.py &> /dev/null && (grep -Fiq "django" requirements.txt) && echo Python/Django || echo Python
+# If only `setup.py`, assume that the app is not Django.
+if [ ! -f $BUILD_DIR/requirements.txt ]; then
+  echo Python
+  exit 0
+fi
+
+# `Python/Django` if `**/settings.py` is present and `django` exists in 
+# `requirements.txt`.
+#
+# Otherwise, `Python`.
+
+ls $BUILD_DIR/**/settings.py &> /dev/null && (grep -Fiq "django" $BUILD_DIR/requirements.txt) && echo Python/Django || echo Python
diff --git a/bin/test b/bin/test
index ac68109641b48f9deed878a3b2e3745e650454e1..ab027e47688d22eba0e97d11276b310d1a30c858 100755
--- a/bin/test
+++ b/bin/test
@@ -8,6 +8,67 @@
 # run the tests.
 #
 
+testDetectWithReqs() {
+  detect "simple-requirements"
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
+
+testDetectWithEmptyReqs() {
+  detect "empty-requirements"
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
+
+testDetectDjango14() {
+  detect "django-1.4-skeleton"
+  assertCapturedEquals "Python/Django"
+  assertCapturedSuccess
+}
+
+testDetectDjango13() {
+  detect "django-1.3-skeleton"
+  assertCapturedEquals "Python/Django"
+  assertCapturedSuccess
+}
+
+testDetectNotDjangoWithSettings() {
+  detect "not-django"
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
+
+testDetectWithSetupPy() {
+  detect "distutils"
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
+
+testDetectWithSetupRequires() {
+  detect "no-requirements"
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
+
+testDetectNotPython() {
+  detect "not-python"
+  assertNotCaptured "Python"
+  assertNoAppDetected
+}
+
+# testPackageJsonWithVersion() {
+#   compile "package-json-version"
+#   assertCaptured "Using Node.js version: 0.6.11"
+#   assertCaptured "Using npm version: 1.1.9"
+#   assertCapturedSuccess
+# }
+
+# testPackageJsonWithoutVersion() {
+#   compile "package-json-noversion"
+#   assertCaptured "Using Node.js version: 0.4.7"
+#   assertCaptured "Using npm version: 1.0.106"
+#   assertCapturedSuccess
+# }
 
 ## utils ########################################
 
diff --git a/test/django-1.3-skeleton/haystack/__init__.py b/test/django-1.3-skeleton/haystack/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/django-1.3-skeleton/haystack/manage.py b/test/django-1.3-skeleton/haystack/manage.py
new file mode 100644
index 0000000000000000000000000000000000000000..3e4eedc9ff5862c99e999b544a5b34c4e9af877a
--- /dev/null
+++ b/test/django-1.3-skeleton/haystack/manage.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+from django.core.management import execute_manager
+import imp
+try:
+    imp.find_module('settings') # Assumed to be in the same directory.
+except ImportError:
+    import sys
+    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
+    sys.exit(1)
+
+import settings
+
+if __name__ == "__main__":
+    execute_manager(settings)
diff --git a/test/django-1.3-skeleton/haystack/settings.py b/test/django-1.3-skeleton/haystack/settings.py
new file mode 100644
index 0000000000000000000000000000000000000000..7fa39cd4a7aace7307ef88b2598098d7b64a3edb
--- /dev/null
+++ b/test/django-1.3-skeleton/haystack/settings.py
@@ -0,0 +1,145 @@
+# Django settings for haystack project.
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+    # ('Your Name', 'your_email@example.com'),
+)
+
+MANAGERS = ADMINS
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': '',                      # Or path to database file if using sqlite3.
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with 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.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'America/Chicago'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale
+USE_L10N = True
+
+# Absolute filesystem path to the directory that will hold user-uploaded files.
+# Example: "/home/media/media.lawrence.com/media/"
+MEDIA_ROOT = ''
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash.
+# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+MEDIA_URL = ''
+
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = ''
+
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# URL prefix for admin static files -- CSS, JavaScript and images.
+# Make sure to use a trailing slash.
+# Examples: "http://foo.com/static/admin/", "/static/admin/".
+ADMIN_MEDIA_PREFIX = '/static/admin/'
+
+# Additional locations of static files
+STATICFILES_DIRS = (
+    # Put strings here, like "/home/html/static" or "C:/www/django/static".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+)
+
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '@$87s&royz$nvav^3*$4u6^htybq*o=ge504rqp7r2)@ec*g(3'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+#     'django.template.loaders.eggs.Loader',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+)
+
+ROOT_URLCONF = 'haystack.urls'
+
+TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+)
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    # Uncomment the next line to enable the admin:
+    # 'django.contrib.admin',
+    # Uncomment the next line to enable admin documentation:
+    # 'django.contrib.admindocs',
+)
+
+# A sample logging configuration. The only tangible logging
+# performed by this configuration is to send an email to
+# the site admins on every HTTP 500 error.
+# See http://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'class': 'django.utils.log.AdminEmailHandler'
+        }
+    },
+    'loggers': {
+        'django.request': {
+            'handlers': ['mail_admins'],
+            'level': 'ERROR',
+            'propagate': True,
+        },
+    }
+}
diff --git a/test/django-1.3-skeleton/haystack/urls.py b/test/django-1.3-skeleton/haystack/urls.py
new file mode 100644
index 0000000000000000000000000000000000000000..a6a070bf3b1b6dd4cd4134f71beac2e20d372d24
--- /dev/null
+++ b/test/django-1.3-skeleton/haystack/urls.py
@@ -0,0 +1,17 @@
+from django.conf.urls.defaults import patterns, include, url
+
+# Uncomment the next two lines to enable the admin:
+# from django.contrib import admin
+# admin.autodiscover()
+
+urlpatterns = patterns('',
+    # Examples:
+    # url(r'^$', 'haystack.views.home', name='home'),
+    # url(r'^haystack/', include('haystack.foo.urls')),
+
+    # Uncomment the admin/doc line below to enable admin documentation:
+    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+    # Uncomment the next line to enable the admin:
+    # url(r'^admin/', include(admin.site.urls)),
+)
diff --git a/test/django-1.3-skeleton/requirements.txt b/test/django-1.3-skeleton/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b1531dc74bb3debeb83cbbc1306a504adc3408d8
--- /dev/null
+++ b/test/django-1.3-skeleton/requirements.txt
@@ -0,0 +1 @@
+django==1.3
\ No newline at end of file
diff --git a/test/django-1.4-skeleton/haystack/__init__.py b/test/django-1.4-skeleton/haystack/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/django-1.4-skeleton/haystack/settings.py b/test/django-1.4-skeleton/haystack/settings.py
new file mode 100644
index 0000000000000000000000000000000000000000..5ca2450ed8a3ee0cf030ef9acc99048669a3731f
--- /dev/null
+++ b/test/django-1.4-skeleton/haystack/settings.py
@@ -0,0 +1,154 @@
+# Django settings for haystack project.
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+    # ('Your Name', 'your_email@example.com'),
+)
+
+MANAGERS = ADMINS
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': '',                      # Or path to database file if using sqlite3.
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with 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.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'America/Chicago'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale.
+USE_L10N = True
+
+# If you set this to False, Django will not use timezone-aware datetimes.
+USE_TZ = True
+
+# Absolute filesystem path to the directory that will hold user-uploaded files.
+# Example: "/home/media/media.lawrence.com/media/"
+MEDIA_ROOT = ''
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash.
+# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+MEDIA_URL = ''
+
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = ''
+
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# Additional locations of static files
+STATICFILES_DIRS = (
+    # Put strings here, like "/home/html/static" or "C:/www/django/static".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+)
+
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '633$+yuh67kvt_v8gpi9zmkvqb*m5nts6&a=q^dwhi+e#^j_ki'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+#     'django.template.loaders.eggs.Loader',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    # Uncomment the next line for simple clickjacking protection:
+    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+ROOT_URLCONF = 'haystack.urls'
+
+# Python dotted path to the WSGI application used by Django's runserver.
+WSGI_APPLICATION = 'haystack.wsgi.application'
+
+TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+)
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    # Uncomment the next line to enable the admin:
+    # 'django.contrib.admin',
+    # Uncomment the next line to enable admin documentation:
+    # 'django.contrib.admindocs',
+)
+
+# A sample logging configuration. The only tangible logging
+# performed by this configuration is to send an email to
+# the site admins on every HTTP 500 error when DEBUG=False.
+# See http://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'filters': {
+        'require_debug_false': {
+            '()': 'django.utils.log.RequireDebugFalse'
+        }
+    },
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'filters': ['require_debug_false'],
+            'class': 'django.utils.log.AdminEmailHandler'
+        }
+    },
+    'loggers': {
+        'django.request': {
+            'handlers': ['mail_admins'],
+            'level': 'ERROR',
+            'propagate': True,
+        },
+    }
+}
diff --git a/test/django-1.4-skeleton/haystack/urls.py b/test/django-1.4-skeleton/haystack/urls.py
new file mode 100644
index 0000000000000000000000000000000000000000..570343210d044f3d76bc1235537396cc2c6e9e3c
--- /dev/null
+++ b/test/django-1.4-skeleton/haystack/urls.py
@@ -0,0 +1,17 @@
+from django.conf.urls import patterns, include, url
+
+# Uncomment the next two lines to enable the admin:
+# from django.contrib import admin
+# admin.autodiscover()
+
+urlpatterns = patterns('',
+    # Examples:
+    # url(r'^$', 'haystack.views.home', name='home'),
+    # url(r'^haystack/', include('haystack.foo.urls')),
+
+    # Uncomment the admin/doc line below to enable admin documentation:
+    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+    # Uncomment the next line to enable the admin:
+    # url(r'^admin/', include(admin.site.urls)),
+)
diff --git a/test/django-1.4-skeleton/haystack/wsgi.py b/test/django-1.4-skeleton/haystack/wsgi.py
new file mode 100644
index 0000000000000000000000000000000000000000..e7e1a77f2aef0eaa7212b46ffdc1854bb9bfd143
--- /dev/null
+++ b/test/django-1.4-skeleton/haystack/wsgi.py
@@ -0,0 +1,28 @@
+"""
+WSGI config for haystack project.
+
+This module contains the WSGI application used by Django's development server
+and any production WSGI deployments. It should expose a module-level variable
+named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
+this application via the ``WSGI_APPLICATION`` setting.
+
+Usually you will have the standard Django WSGI application here, but it also
+might make sense to replace the whole Django WSGI application with a custom one
+that later delegates to the Django one. For example, you could introduce WSGI
+middleware here, or combine a Django application with an application of another
+framework.
+
+"""
+import os
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "haystack.settings")
+
+# This application object is used by any WSGI server configured to use this
+# file. This includes Django's development server, if the WSGI_APPLICATION
+# setting points here.
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
+
+# Apply WSGI middleware here.
+# from helloworld.wsgi import HelloWorldApplication
+# application = HelloWorldApplication(application)
diff --git a/test/django-1.4-skeleton/manage.py b/test/django-1.4-skeleton/manage.py
new file mode 100644
index 0000000000000000000000000000000000000000..cf7427b1ba6a9a9aad442ab4d9954ac6c506694d
--- /dev/null
+++ b/test/django-1.4-skeleton/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "haystack.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/test/django-1.4-skeleton/requirements.txt b/test/django-1.4-skeleton/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..23b57dcf506fc7316cd6b258de42c7d79fc2496b
--- /dev/null
+++ b/test/django-1.4-skeleton/requirements.txt
@@ -0,0 +1 @@
+Django==1.4
\ No newline at end of file
diff --git a/test/empty-requirements/requirements.txt b/test/empty-requirements/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/no-requirements/setup.py b/test/no-requirements/setup.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..231a07bfe9bb26c415d2b868a0cfb0cdbdf9f1f9 100644
--- a/test/no-requirements/setup.py
+++ b/test/no-requirements/setup.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+required = ['httpbin']
+
+setup(
+    name='haystack',
+    version='0.0.1',
+    description='Simple API for running external processes.',
+    author='Kenneth Reitz',
+    author_email='me@kennethreitz.com',
+    install_requires=required,
+    license='MIT',
+    classifiers=(
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        # 'Programming Language :: Python :: 3.0',
+        # 'Programming Language :: Python :: 3.1',
+    ),
+)
diff --git a/test/not-django/haystack/settings.py b/test/not-django/haystack/settings.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/not-django/manage.py b/test/not-django/manage.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/not-django/requirements.txt b/test/not-django/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..82cd95568a8b4dc302ab775f7f17fc8d0505726c
--- /dev/null
+++ b/test/not-django/requirements.txt
@@ -0,0 +1 @@
+flask==0.8
\ No newline at end of file
diff --git a/test/simple-requirements/requirements.txt b/test/simple-requirements/requirements.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ac9fa42620114d9518c9983d401b78c0d93e427d 100644
--- a/test/simple-requirements/requirements.txt
+++ b/test/simple-requirements/requirements.txt
@@ -0,0 +1 @@
+httpbin
\ No newline at end of file