keep me logged in -- fixes #16
Merge branch 'dev'