Update custom user models to use full_name and short_name. Brought back usernames into schema.
Merge branch 'master' of github.com:jonathanchu/stashdaddy