Merge pull request #373 from jrperritt/auto-reauth

Auto reauth; Closes #152