Merge branch 'master' into pyup-update-flake8-3.2.1-to-3.3.0

README.rst

@@ -32,6 +32,7 @@ Features
 * Renders Django projects with 100% starting test coverage
 * Twitter Bootstrap_ v4.0.0 - `alpha 4`_ (`maintained Foundation fork`_ also available)
 * 12-Factor_ based settings via django-environ_
+* Secure by default. We believe in SSL.
 * Optimized development and production settings
 * Registration via django-allauth_
 * Comes with custom user model ready to go

requirements.txt

@@ -1,5 +1,5 @@
-cookiecutter==1.5.0
-flake8==3.3.0 # pyup: != 2.6.0
+cookiecutter==1.5.1
+flake8==3.2.1 # pyup: != 2.6.0
 sh==1.12.9
 binaryornot==0.4.0
 
@@ -7,5 +7,5 @@ binaryornot==0.4.0
 pytest==3.0.6
 pep8==1.7.0
 pyflakes==1.5.0
-tox==2.5.0
+tox==2.6.0
 pytest-cookies==0.2.0

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

@@ -19,7 +19,7 @@ gunicorn==19.6.0
 boto==2.45.0
 django-storages-redux==1.3.2
 {% if cookiecutter.use_whitenoise != 'y' -%}
-Collectfast==0.5.1
+Collectfast==0.5.2
 {%- endif %}
 
 # Email backends for Mailgun, Postmark, SendGrid and more