Fix Travis Django installation
Merge