added proper flash messages for login/out.
Merge branch 'master' into gabe
Merge branch 'gabe'
Fix merge conflicts