[1.0.x] make tests succeed on Django-1.7

(cherry picked from commit fc83133312ef976dd24905136967102351b814ea)
[1.0.x] Update travis.yml to run Django 1.7 tests

(cherry picked from commit e732df17b36de5b3738c39da30c330a1871e755d)
Release 1.0.6