Add User import.  Refs #599
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework