This patchset resolves a number of issues related to support for Django 1.7. These fixes do not impact support for Django 1.5 and 1.6. To ensure this remains the case, a tox file has been added to run unit tests against the myriad environments.