thanks!

remove need for --email and --password in bidpom tests

run.py updates,rebased (was pull request 2338)

    * comment that i think it will work with python 2.6
    * write out a credentials.yaml file if it doesn't exist
    * save results to different folders so you end up with all of them
    rather than just the most recently finished

    put in missing comma

    it was causing a file "-.html" to be created

    pull out sauce and globalize no proxy

    no more StaleElementException, hopefully

    rework --everywhere

    since it probably maxes out at 3 browsers, removed the limitation about
    doing --all and --everywhere at the same time

    changed python version limitation to 2.6

    update README to warn people about python on windows

    append .exe to program names so they can be found on windows

    run.py now runs well on windows and -e calls both FF and Chrome

    IEDriver does not provide a clean environment, tests will Error from
    the second run
    Opera does not have a local WebDriver implementation.

all tests can be run by travis now

use npm-lockdown

(selenium tests) fix enemy #1 - turn two distinct transactions into a signle transaction to fix StaleElementErrors seen during ChangePassword tests /cc @klrmn @zac @6a68

A script to run all selenium tests against saucelabs from the command line or another script

A script to run tests against saucelabs (w/ contributions from Leah [:klrmn] Klearman and Zach [:zcarter] Carter)

Issue #2277 signup redirect

This gets an r+ from me.  Nice cleanup as well @zaach.

close #2277

4c10bb2 Merge pull request #42 from zacc/add_is_this_your_computer
a490f28 Add methods and test for 'is this your computer'

git-subtree-dir: automation-tests/browserid
git-subtree-split: 4c10bb2b2c46b6b56d224f52945b55c4e1c256f1

avoid running tests that require --email

Bug #2307: don't expire existing sessions when adding a secondary address

If a persona.org account is initially created with a "primary"
address (meaning an address served by a participating IdP, so
persona.org is given an assertion from that IdP as proof of ownership),
the new account will not have a password associated with it. If you then
add a "secondary" address (meaning an address *not* served by a
participating IdP, requiring an email challenge to prove ownership), you
will have to set up a password when you add the secondary. The
establishment of this password should *not* invalidate any sessions that
were set up earlier.

In Bug #2307, this manifested as the first browser (in which the
add-secondary-email operation was started, so it had the old session and
was waiting for the operation to complete, polling
/wsapi/email_addition_status all the while) receiving a "400
Unauthorized" error when the email challenge link was opened in a second
browser (which thus got a new session).

The test for this effect lives in tests/primary-then-secondary-test.js,
which need the same 2-second delay as password-update-test.js (to make
sure that the modified lastPasswordReset time was actually different
than the previous value, so the session really would be expired).

avoiding them in two ways,
* -m travis
* skip if mozwebqa.email == None

also, longer timeouts

Removing DEPLOYMENT.md per lloyd

Personaorg tests

Issue 2254 runpy enhancements

* Use termsOfService over tosURL and privacyPolicy over privacyURL
* Check for renamed/deprecated tosURL and privacyURL.
* Check for deprecated requiredEmail.
* Check for renamed loggedInUser/loggedInEmail

Fix users who enter wrong email address, cancel, enter correct email address then forgot password.

Conflicts:
	.gitignore
	ChangeLog
	lib/email.js
	package.json
	scripts/browserid.spec