removed models.py so that it matches develop branch
Merge branch 'add_better_test_framework' into colander