Remove the Shane comment code.
Merge remote-tracking branch 'origin/master'
Add useful return code if email/password is missing from logon request.