Revert "fixed the logout functionality when specifying a user model to use. Base now returns 'name' if it exists on the model as the display name."

This reverts commit af10ded1d7978e745d1edb6c26758293c18e7dc0.
merging?
fixed many to one merge problem
Merge branch 'master' of github.com:soundintheory/fuel-cmf
fixed another merge issue