Support sandbox logins

Updates to support running against sandbox organizations.