Django 1.7

Resolves #20