Updates to work with Django 1.7

Note that Django 1.7 is not enforced in requirements.txt by design at this time.