Merge branch 'master' into mattf-django-rest
Rename model.py to models.py

More consistent with what other people are doing. Snore.
It can now display the user json data
Documents the new Rest API
Django REST API now (partially) working

Able to list the users in the system. Needs:

 * Proper urls with auth handling and all that
 * Fixing Django Admin ability to create and update users
 * Fixing rest traversal of referenced resources
 * Handling create update delete