[WIP] Updates required to work on Django 1.7