Merge branch 'master' into simplify-environment

# Conflicts:
#	docs/deployment-on-heroku.rst

docs/deployment-on-heroku.rst

@@ -17,7 +17,8 @@ Run these commands to deploy the project to Heroku:
     heroku addons:create mailgun
 
     heroku config:set WEB_CONCURRENCY=4
-    heroku config:set DJANGO_ADMIN_URL="$(openssl rand -base64 32)"
+    # Generating a 32 character-long random string without any of the visually similiar characters "IOl01":
+    heroku config:set DJANGO_ADMIN_URL="^$(openssl rand -base64 4096 | tr -dc 'A-HJ-NP-Za-km-z2-9' | head -c 32)/"
     heroku config:set DJANGO_SECRET_KEY="$(openssl rand -base64 64)"
     heroku config:set DJANGO_SETTINGS_MODULE='config.settings.production'
     heroku config:set DJANGO_ALLOWED_HOSTS='.herokuapp.com'
@@ -26,8 +27,10 @@ Run these commands to deploy the project to Heroku:
     heroku config:set DJANGO_AWS_SECRET_ACCESS_KEY=YOUR_AWS_SECRET_ACCESS_KEY_HERE
     heroku config:set DJANGO_AWS_STORAGE_BUCKET_NAME=YOUR_AWS_S3_BUCKET_NAME_HERE
 
+    # This is to be set only if you're using Sentry:
+    heroku config:set DJANGO_SENTRY_DSN=YOUR_SENTRY_DSN
+
     heroku config:set PYTHONHASHSEED=random
-    heroku config:set DJANGO_ADMIN_URL=\^somelocation/
 
     git push heroku master
     heroku run python manage.py migrate

docs/project-generation-options.rst

@@ -19,7 +19,7 @@ email [daniel-roy-greenfeld@example.com]:
     The email address you want to identify yourself in the project.
 
 domain_name [example.com]
-    The domain name you plan to use for your project ones it goes live.
+    The domain name you plan to use for your project once it goes live.
     Note that it can be safely changed later on whenever you need to.
 
 version [0.1.0]

requirements.txt

@@ -14,5 +14,5 @@ pyflakes==1.6.0
 # ------------------------------------------------------------------------------
 tox==2.9.1
 
-pytest==3.4.1
+pytest==3.4.2
 pytest-cookies==0.3.0

{{cookiecutter.project_slug}}/requirements/base.txt

@@ -16,7 +16,7 @@ whitenoise==3.3.1
 
 
 # Forms
-django-crispy-forms==1.7.0
+django-crispy-forms==1.7.1
 
 # Models
 django-model-utils==3.1.1