Added support for swapped models
Full compatibility with Django 1.6 (tests passing)