Upgrade to Django 1.7
Merge pull request #129 from MattBlack85/gh-122_update_to_1.7

Update to Django 1.7