Fixed an issue where asking for the current user with a token would fail if the user was cached.
Merge pull request #365 from girder/fix-user-token-cache

Fixed an issue where asking for the current user with a token would fail.
Clean up loadmodel decorator

I wasn't aware of class decorator semantics when I wrote it.
Merge pull request #366 from girder/cleanup-loadmodel-decorator

Clean up loadmodel decorator