Removed unused models
Moved non-conflicting models
Fixed typos
Merge branch 'master' of github.com:tomchristie/django-rest-framework
Merge pull request #2161 from NextHub/master

Move models to respective test modules