Merge latest develop changes.

Author: Dennis Schwartz

.travis.yml

@@ -39,7 +39,7 @@ jobs:
       -e DB_PASSWORD=$DB_PASSWORD
       -e GITHUB_CLIENT_SECRET=$GITHUB_CLIENT_SECRET
       -e GITHUB_CLIENT_ID=$GITHUB_CLIENT_ID
-      philm/ansible_playbook dev-production.yml
+      philm/ansible_playbook production-deploy.yml
       --private-key=~/.ssh/id_rsa -u ubuntu -i production_hosts
 notifications:
   email: true

biojs/settings.py

@@ -23,7 +23,7 @@
 SECRET_KEY = '$&&+$xz)50khd6q+aq&95r1$2urmmdv37=-*lu3v-wwh46829t'
 
 try:
-    from config import *
+    from config import GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET
     GITHUB_CLIENT_ID = GITHUB_CLIENT_ID
     GITHUB_CLIENT_SECRET = GITHUB_CLIENT_SECRET
 except:
@@ -33,6 +33,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 try:
     from config import DEBUG
+    DEBUG = DEBUG
 except:
     DEBUG = False
 
@@ -89,7 +90,7 @@
 # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
 
 try:
-    from config import *
+    from config import DATABASE_NAME, DATABASE_USERNAME, DATABASE_PASSWORD
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.postgresql_psycopg2',