Updated to work around StrAndUnicode removal in 1.7
Added Django 1.7 to tox and travis settings
Initiate the app registry in tests for Django 1.7+
Fixes for review feedback
Merge pull request #62 from robhudson/django17

Updated to work around StrAndUnicode removal in 1.7 (fixes #61)