Merge pull request #297 from settinghead/master

Test popup blocker and show error message if the test fails before authenticating
Merge pull request #300 from settinghead/master

Delay popup test to simulate a delayed google popup
Merge remote-tracking branch 'upstream/master'