Removed unused reference to django.utils.encoding.StrAndUnicode. StrAndUnicode no longer exists in Django 1.7+.
Merge pull request #121 from AndrewGrossman/master

Django 1.7 compatibility: Removed unused reference to django.utils.encoding.StrAndUnicode. StrAndU...