Merges code from: https://github.com/ddemid/ember-data-django-tastypie
More tests fixes...