Merge pull request #1 from jsatt/master

improve tests and setup tox to test all supported django versions
move persistence check into `meets_criteria`

fixes #2