Update django 1.7.1
Merge pull request #56 from sigurdsa/update-django

Update django to 1.7.1