Added in a wait upon logging in
Revert back to old way of logging someone else in
Merge pull request #630 from edx/jonahstanley/fix-courseteam-tests

Jonahstanley/fix courseteam tests