Merge pull request #105 from funkybob/feature/no-six

Use Django's vendored copy of six

notifications/models.py

@@ -12,7 +12,7 @@ else:
 
 from django.db import models
 from django.core.exceptions import ImproperlyConfigured
-from six import text_type
+from django.utils.six import text_type
 from .utils import id2slug
 
 from .signals import notify

setup.py

@@ -24,7 +24,6 @@ setup(
     install_requires=[
         'django>=1.7',
         'django-model-utils>=2.0.3',
-        'six>=1.9.0',
         'jsonfield>=1.0.3',
     ],
     test_requires=[