diff --git a/.gitignore b/.gitignore
index 13f37e3f1c..2358d2e2a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-lib/settings/local_settings.py
+lib/settings/local_settings.py*
lib/acom.sqlite3
lib/projects
lib/public/media
diff --git a/lib/settings/local_settings.py.25142.1368115546.78.tmp b/lib/settings/local_settings.py.25142.1368115546.78.tmp
deleted file mode 100644
index 0eb3e522ba..0000000000
--- a/lib/settings/local_settings.py.25142.1368115546.78.tmp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Local Django settings for Ansible Commander project.
-
-# Copyright (c) 2013 AnsibleWorks, Inc.
-#
-# This file is part of Ansible Commander.
-#
-# Ansible Commander is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# Ansible Commander is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible Commander. If not, see .
-
-
-from defaults import *
-
-ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': 'acom',
- 'USER': 'ansible_commander',
- 'PASSWORD': 'gateIsDown',
- 'HOST': '',
- 'PORT': '',
- }
-}
-
-if 'test' in sys.argv or 'ACOM_TEST_DATABASE_NAME' in os.environ:
- DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'acom.sqlite3'),
- # Test database cannot be :memory: for celery/inventory tests to work.
- 'TEST_NAME': os.path.join(BASE_DIR, 'acom_test.sqlite3'),
- }
- }
-
-# Absolute filesystem path to the directory to host projects (with playbooks).
-# This directory should not be web-accessible.
-PROJECTS_ROOT = os.path.join(BASE_DIR, 'projects')
-
-# 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/New_York'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-# SECURITY WARNING: keep the secret key used in production secret!
-# Hardcoded values can leak through source control. Consider loading
-# the secret key from an environment variable or a file instead.
-SECRET_KEY = 'p7z7g1ql4%6+(6nlebb6hdk7sd^&fnjpal308%n%+p^_e6vo1y'
-
-# Email address that error messages come from.
-SERVER_EMAIL = 'root@localhost'
-
-# The email backend to use. For possible shortcuts see django.core.mail.
-# The default is to use the SMTP backend.
-# Third-party backends can be specified by providing a Python path
-# to a module that defines an EmailBackend class.
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-
-# Host for sending email.
-EMAIL_HOST = 'localhost'
-
-# Port for sending email.
-EMAIL_PORT = 25
-
-# Optional SMTP authentication information for EMAIL_HOST.
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_USE_TLS = False
-
-# Default email address to use for various automated correspondence from
-# the site managers.
-DEFAULT_FROM_EMAIL = 'webmaster@localhost'
-
-# Subject-line prefix for email messages send with django.core.mail.mail_admins
-# or ...mail_managers. Make sure to include the trailing space.
-EMAIL_SUBJECT_PREFIX = '[ACOM] '
diff --git a/lib/settings/local_settings.py.26911.1368115716.57.tmp b/lib/settings/local_settings.py.26911.1368115716.57.tmp
deleted file mode 100644
index 0eb3e522ba..0000000000
--- a/lib/settings/local_settings.py.26911.1368115716.57.tmp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Local Django settings for Ansible Commander project.
-
-# Copyright (c) 2013 AnsibleWorks, Inc.
-#
-# This file is part of Ansible Commander.
-#
-# Ansible Commander is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# Ansible Commander is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible Commander. If not, see .
-
-
-from defaults import *
-
-ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': 'acom',
- 'USER': 'ansible_commander',
- 'PASSWORD': 'gateIsDown',
- 'HOST': '',
- 'PORT': '',
- }
-}
-
-if 'test' in sys.argv or 'ACOM_TEST_DATABASE_NAME' in os.environ:
- DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'acom.sqlite3'),
- # Test database cannot be :memory: for celery/inventory tests to work.
- 'TEST_NAME': os.path.join(BASE_DIR, 'acom_test.sqlite3'),
- }
- }
-
-# Absolute filesystem path to the directory to host projects (with playbooks).
-# This directory should not be web-accessible.
-PROJECTS_ROOT = os.path.join(BASE_DIR, 'projects')
-
-# 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/New_York'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-# SECURITY WARNING: keep the secret key used in production secret!
-# Hardcoded values can leak through source control. Consider loading
-# the secret key from an environment variable or a file instead.
-SECRET_KEY = 'p7z7g1ql4%6+(6nlebb6hdk7sd^&fnjpal308%n%+p^_e6vo1y'
-
-# Email address that error messages come from.
-SERVER_EMAIL = 'root@localhost'
-
-# The email backend to use. For possible shortcuts see django.core.mail.
-# The default is to use the SMTP backend.
-# Third-party backends can be specified by providing a Python path
-# to a module that defines an EmailBackend class.
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-
-# Host for sending email.
-EMAIL_HOST = 'localhost'
-
-# Port for sending email.
-EMAIL_PORT = 25
-
-# Optional SMTP authentication information for EMAIL_HOST.
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_USE_TLS = False
-
-# Default email address to use for various automated correspondence from
-# the site managers.
-DEFAULT_FROM_EMAIL = 'webmaster@localhost'
-
-# Subject-line prefix for email messages send with django.core.mail.mail_admins
-# or ...mail_managers. Make sure to include the trailing space.
-EMAIL_SUBJECT_PREFIX = '[ACOM] '
diff --git a/lib/settings/local_settings.py.28656.1368116066.38.tmp b/lib/settings/local_settings.py.28656.1368116066.38.tmp
deleted file mode 100644
index 0eb3e522ba..0000000000
--- a/lib/settings/local_settings.py.28656.1368116066.38.tmp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Local Django settings for Ansible Commander project.
-
-# Copyright (c) 2013 AnsibleWorks, Inc.
-#
-# This file is part of Ansible Commander.
-#
-# Ansible Commander is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# Ansible Commander is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible Commander. If not, see .
-
-
-from defaults import *
-
-ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': 'acom',
- 'USER': 'ansible_commander',
- 'PASSWORD': 'gateIsDown',
- 'HOST': '',
- 'PORT': '',
- }
-}
-
-if 'test' in sys.argv or 'ACOM_TEST_DATABASE_NAME' in os.environ:
- DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'acom.sqlite3'),
- # Test database cannot be :memory: for celery/inventory tests to work.
- 'TEST_NAME': os.path.join(BASE_DIR, 'acom_test.sqlite3'),
- }
- }
-
-# Absolute filesystem path to the directory to host projects (with playbooks).
-# This directory should not be web-accessible.
-PROJECTS_ROOT = os.path.join(BASE_DIR, 'projects')
-
-# 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/New_York'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-# SECURITY WARNING: keep the secret key used in production secret!
-# Hardcoded values can leak through source control. Consider loading
-# the secret key from an environment variable or a file instead.
-SECRET_KEY = 'p7z7g1ql4%6+(6nlebb6hdk7sd^&fnjpal308%n%+p^_e6vo1y'
-
-# Email address that error messages come from.
-SERVER_EMAIL = 'root@localhost'
-
-# The email backend to use. For possible shortcuts see django.core.mail.
-# The default is to use the SMTP backend.
-# Third-party backends can be specified by providing a Python path
-# to a module that defines an EmailBackend class.
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-
-# Host for sending email.
-EMAIL_HOST = 'localhost'
-
-# Port for sending email.
-EMAIL_PORT = 25
-
-# Optional SMTP authentication information for EMAIL_HOST.
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_USE_TLS = False
-
-# Default email address to use for various automated correspondence from
-# the site managers.
-DEFAULT_FROM_EMAIL = 'webmaster@localhost'
-
-# Subject-line prefix for email messages send with django.core.mail.mail_admins
-# or ...mail_managers. Make sure to include the trailing space.
-EMAIL_SUBJECT_PREFIX = '[ACOM] '
diff --git a/lib/settings/local_settings.py.520.1367863259.57.tmp b/lib/settings/local_settings.py.520.1367863259.57.tmp
deleted file mode 100644
index 0eb3e522ba..0000000000
--- a/lib/settings/local_settings.py.520.1367863259.57.tmp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Local Django settings for Ansible Commander project.
-
-# Copyright (c) 2013 AnsibleWorks, Inc.
-#
-# This file is part of Ansible Commander.
-#
-# Ansible Commander is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# Ansible Commander is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible Commander. If not, see .
-
-
-from defaults import *
-
-ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': 'acom',
- 'USER': 'ansible_commander',
- 'PASSWORD': 'gateIsDown',
- 'HOST': '',
- 'PORT': '',
- }
-}
-
-if 'test' in sys.argv or 'ACOM_TEST_DATABASE_NAME' in os.environ:
- DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'acom.sqlite3'),
- # Test database cannot be :memory: for celery/inventory tests to work.
- 'TEST_NAME': os.path.join(BASE_DIR, 'acom_test.sqlite3'),
- }
- }
-
-# Absolute filesystem path to the directory to host projects (with playbooks).
-# This directory should not be web-accessible.
-PROJECTS_ROOT = os.path.join(BASE_DIR, 'projects')
-
-# 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/New_York'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-# SECURITY WARNING: keep the secret key used in production secret!
-# Hardcoded values can leak through source control. Consider loading
-# the secret key from an environment variable or a file instead.
-SECRET_KEY = 'p7z7g1ql4%6+(6nlebb6hdk7sd^&fnjpal308%n%+p^_e6vo1y'
-
-# Email address that error messages come from.
-SERVER_EMAIL = 'root@localhost'
-
-# The email backend to use. For possible shortcuts see django.core.mail.
-# The default is to use the SMTP backend.
-# Third-party backends can be specified by providing a Python path
-# to a module that defines an EmailBackend class.
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-
-# Host for sending email.
-EMAIL_HOST = 'localhost'
-
-# Port for sending email.
-EMAIL_PORT = 25
-
-# Optional SMTP authentication information for EMAIL_HOST.
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_USE_TLS = False
-
-# Default email address to use for various automated correspondence from
-# the site managers.
-DEFAULT_FROM_EMAIL = 'webmaster@localhost'
-
-# Subject-line prefix for email messages send with django.core.mail.mail_admins
-# or ...mail_managers. Make sure to include the trailing space.
-EMAIL_SUBJECT_PREFIX = '[ACOM] '
diff --git a/lib/settings/local_settings.py.773.1367863511.14.tmp b/lib/settings/local_settings.py.773.1367863511.14.tmp
deleted file mode 100644
index 0eb3e522ba..0000000000
--- a/lib/settings/local_settings.py.773.1367863511.14.tmp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Local Django settings for Ansible Commander project.
-
-# Copyright (c) 2013 AnsibleWorks, Inc.
-#
-# This file is part of Ansible Commander.
-#
-# Ansible Commander is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# Ansible Commander is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible Commander. If not, see .
-
-
-from defaults import *
-
-ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': 'acom',
- 'USER': 'ansible_commander',
- 'PASSWORD': 'gateIsDown',
- 'HOST': '',
- 'PORT': '',
- }
-}
-
-if 'test' in sys.argv or 'ACOM_TEST_DATABASE_NAME' in os.environ:
- DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'acom.sqlite3'),
- # Test database cannot be :memory: for celery/inventory tests to work.
- 'TEST_NAME': os.path.join(BASE_DIR, 'acom_test.sqlite3'),
- }
- }
-
-# Absolute filesystem path to the directory to host projects (with playbooks).
-# This directory should not be web-accessible.
-PROJECTS_ROOT = os.path.join(BASE_DIR, 'projects')
-
-# 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/New_York'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-# SECURITY WARNING: keep the secret key used in production secret!
-# Hardcoded values can leak through source control. Consider loading
-# the secret key from an environment variable or a file instead.
-SECRET_KEY = 'p7z7g1ql4%6+(6nlebb6hdk7sd^&fnjpal308%n%+p^_e6vo1y'
-
-# Email address that error messages come from.
-SERVER_EMAIL = 'root@localhost'
-
-# The email backend to use. For possible shortcuts see django.core.mail.
-# The default is to use the SMTP backend.
-# Third-party backends can be specified by providing a Python path
-# to a module that defines an EmailBackend class.
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-
-# Host for sending email.
-EMAIL_HOST = 'localhost'
-
-# Port for sending email.
-EMAIL_PORT = 25
-
-# Optional SMTP authentication information for EMAIL_HOST.
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_USE_TLS = False
-
-# Default email address to use for various automated correspondence from
-# the site managers.
-DEFAULT_FROM_EMAIL = 'webmaster@localhost'
-
-# Subject-line prefix for email messages send with django.core.mail.mail_admins
-# or ...mail_managers. Make sure to include the trailing space.
-EMAIL_SUBJECT_PREFIX = '[ACOM] '
diff --git a/lib/settings/local_settings.py.987.1367863546.31.tmp b/lib/settings/local_settings.py.987.1367863546.31.tmp
deleted file mode 100644
index 0eb3e522ba..0000000000
--- a/lib/settings/local_settings.py.987.1367863546.31.tmp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Local Django settings for Ansible Commander project.
-
-# Copyright (c) 2013 AnsibleWorks, Inc.
-#
-# This file is part of Ansible Commander.
-#
-# Ansible Commander is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# Ansible Commander is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible Commander. If not, see .
-
-
-from defaults import *
-
-ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': 'acom',
- 'USER': 'ansible_commander',
- 'PASSWORD': 'gateIsDown',
- 'HOST': '',
- 'PORT': '',
- }
-}
-
-if 'test' in sys.argv or 'ACOM_TEST_DATABASE_NAME' in os.environ:
- DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'acom.sqlite3'),
- # Test database cannot be :memory: for celery/inventory tests to work.
- 'TEST_NAME': os.path.join(BASE_DIR, 'acom_test.sqlite3'),
- }
- }
-
-# Absolute filesystem path to the directory to host projects (with playbooks).
-# This directory should not be web-accessible.
-PROJECTS_ROOT = os.path.join(BASE_DIR, 'projects')
-
-# 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/New_York'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-# SECURITY WARNING: keep the secret key used in production secret!
-# Hardcoded values can leak through source control. Consider loading
-# the secret key from an environment variable or a file instead.
-SECRET_KEY = 'p7z7g1ql4%6+(6nlebb6hdk7sd^&fnjpal308%n%+p^_e6vo1y'
-
-# Email address that error messages come from.
-SERVER_EMAIL = 'root@localhost'
-
-# The email backend to use. For possible shortcuts see django.core.mail.
-# The default is to use the SMTP backend.
-# Third-party backends can be specified by providing a Python path
-# to a module that defines an EmailBackend class.
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-
-# Host for sending email.
-EMAIL_HOST = 'localhost'
-
-# Port for sending email.
-EMAIL_PORT = 25
-
-# Optional SMTP authentication information for EMAIL_HOST.
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_USE_TLS = False
-
-# Default email address to use for various automated correspondence from
-# the site managers.
-DEFAULT_FROM_EMAIL = 'webmaster@localhost'
-
-# Subject-line prefix for email messages send with django.core.mail.mail_admins
-# or ...mail_managers. Make sure to include the trailing space.
-EMAIL_SUBJECT_PREFIX = '[ACOM] '