Fix setup
Merge branch 'master' of github.com:funkybob/django-nap
Added TODO
Change to more generic extra args to Serialiser