Click for re-auth (bug 1026593)
Fix-up naming and remove un-used code from reset-start
Merge pull request #66 from muffinresearch/click-for-reauth

Click for re-auth (bug 1026593)
Add timeout for initial persona login (bug 1002510)