Travis fix

Travis won't fail on older django version any more.
Merge branch 'master' into bugfix#20

* master:
  Travis fix