Upgraded to Django1.7
Merge pull request #1 from mbennett243/django1.7

Upgraded to Django1.7