Merge pull request #3 from inscrutablemike/master

User models may have something other than 'username'
Merge pull request #4 from inscrutablemike/master

Main rest_framework no longer uses User class objects in their
missing secret key
bad import