Remake code that was apparently deleted for logout. Fix  #81
Change model and corresponding test. Close #83

And damn factory girl, never using that again
Merge pull request #82 from banana-slugs-2014/bugfix

Bugfix 2 - It's back