Prevent infinite recursion in Django 1.6
Be more specific in the condition before setting 'fields'
Fix missing ``alters_data = True`` annotations.
Merge pull request #69 from borgstrom/django16

Prevent infinite recursion in Django 1.6
Improve on #69, using setdefault() and update example project

Camp site rule; leave things tidier than you found them :)