Work in progress

Beginning Django 1.7 support