some cleanup for the user context
Merge pull request #79 from FriendsOfSymfony/user-context-cleanup

some cleanup for the user context