updated to the latest version of Django, including 1.7.0
Merge pull request #40 from craigbruce/master

Bumped django versions