Updates for Django 1.7 changes