refactored test matrix to hopefully make Django matrix builds work on travis