More login cookie fixes.
Merge branch 'master' of http://github.com/kbase/narrative