create local prod branch if it doesn't exist and land the user on that.  also only try to delete local train- branch if it *does* exist.

change merge_train.sh to refer to prod with a fully qualified path in case it's yet to have been locally checked out

When triggering the checkregistration:confirmed message, do so through close so that we teardown the controller.

This fixes the problem of adding multiple email addresses in the same dialog lifespan.

close #215

Moving prove email ownership AJAX code from prove.ejs to browserid-network.js where we can add tests for it.

This makes it consistent with authenticateAndSync.

Setting up BrowserIDIDentities so that it can take a network stub for testing purposes.

upgrade to bcrypt 0.2.4 and move to bcrypt async apis, this keeps us from blocking the web server thread and leverages the threading support in the bcrypt library for better compute throughput and responsiveness.

(load gen) add_email might occur on a device that hasn't been used yet, in which case we need to authenticate

test harness now tries to shut down gracefully.  this allows cleanup to occur (i.e. of database when running in a test mode)

output human readable summary information of what kind of load will be applied when the load gen starts with a fixed target number of active users.

close #200

close #195.

Change the csrf response type to 'html'.

This makes sure that the non-XML response is parsed correctly and jQuery does not throw an error.

Fixing a problem where new email addresses added to an existing account would not get synced correctly directly after confirmation.

Conflicts:
	browserid/static/js/browserid.js