^ Changing session to be saved in cakes temp directory.  Hopefully this solves the logout issue
Merge branch 'origin/home'
Merge branch 'origin/master'