Merge branch 'master' of https://github.com/pydanny/cookiecutter-django into f-string

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

@@ -36,7 +36,7 @@ django-allauth==0.35.0
 # from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg
 {% else %}
 # Python-PostgreSQL Database Adapter
-psycopg2==2.7.4
+psycopg2==2.7.4 --no-binary psycopg2
 {%- endif %}
 
 # Unicode slugification

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

@@ -4,7 +4,7 @@
 coverage==4.5.1
 django-coverage-plugin==1.5.0
 
-Sphinx==1.7.0
+Sphinx==1.7.1
 django-extensions==2.0.0
 Werkzeug==0.14.1
 django-test-plus==1.0.22

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

@@ -6,7 +6,7 @@
 # Python-PostgreSQL Database Adapter
 # Assuming Windows is used locally, and *nix -- in production.
 # ------------------------------------------------------------
-psycopg2==2.7.4
+psycopg2==2.7.4 --no-binary psycopg2
 {%- endif %}
 
 # WSGI Handler
@@ -16,7 +16,7 @@ gunicorn==19.7.1
 
 # Static and Media Storage
 # ------------------------------------------------
-boto3==1.5.33
+boto3==1.5.36
 django-storages==1.6.5
 {% if cookiecutter.use_whitenoise != 'y' -%}
 Collectfast==0.6.0

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html

@@ -22,7 +22,7 @@
     <!-- Your stuff: Third-party CSS libraries go here -->
     {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %}
     <!-- This file stores project-specific CSS -->
-    {% endraw %}{% if cookiecutter.js_task_runner == "Gulp" %}{% raw %}
+    {% endraw %}{% if cookiecutter.js_task_runner == "Gulp" and cookiecutter.use_compressor == "n" %}{% raw %}
     <link href="{% static 'css/project.min.css' %}" rel="stylesheet">
     {% endraw %}{% else %}{% raw %}
     <link href="{% static 'css/project.css' %}" rel="stylesheet">

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py

@@ -1,11 +1,9 @@
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.urls import reverse
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 
-@python_2_unicode_compatible
 class User(AbstractUser):
 
     # First Name and Last Name do not cover name patterns