Enabled a django 1.7 build in the travis tests
Merge pull request #26 from jamiecurle/setup-travis-jobs-for-django-1.7

Enabled a django 1.7 build in the travis tests