Makefile.

Makefile

@@ -66,6 +66,7 @@ deploy:
 			> media/js/pro-all.min.js
 
 	@/Users/Nick/.virtualenvs/snipt/bin/python manage.py collectstatic --noinput
+
 	@git push heroku heroku:master
 
 .PHONY: deploy

settings.py

@@ -86,14 +86,6 @@ USE_I18N = True
 USE_L10N = True
 USE_TZ = True
 
-if not DEBUG:
-    AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID', '')
-    AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY', '')
-    AWS_STORAGE_BUCKET_NAME = os.environ.get('AWS_STORAGE_BUCKET_NAME', '')
-    STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
-    S3_URL = 'https://%s.s3.amazonaws.com/' % AWS_STORAGE_BUCKET_NAME
-    STATIC_URL = S3_URL
-
 INSTALLED_APPS = (
     'gunicorn',
     'raven.contrib.django.raven_compat',
@@ -155,3 +147,8 @@ TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
 )
+
+try:
+    from settings_local import *
+except ImportError:
+    pass

settings_local.py-template

@@ -0,0 +1,6 @@
+AWS_ACCESS_KEY_ID = ''
+AWS_SECRET_ACCESS_KEY = ''
+AWS_STORAGE_BUCKET_NAME = ''
+S3_URL = 'https://%s.s3.amazonaws.com/' % AWS_STORAGE_BUCKET_NAME
+STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
+STATIC_URL = S3_URL