Update LICENSE
Merge pull request #545 from feczo/patch-1

Update LICENSE
Add Django 1.7 to Travis
Fix a dumb typo
Merge branch 'master' into next

* master:
  Fix a dumb typo
  Add Django 1.7 to Travis
  Update LICENSE