Django 1.7 compatibility
Merge fixes
Updating AUTHORS file