Clean up some login code so Brigit can test
Merge remote-tracking branch 'upstream/master' into pendulum
Merge pull request #992 from jaypoulz/pendulum

Pendulum -- Minor Stability and Cleanup to Enable Testing for Pendulum Tracker