fix a stupid typo that breaks the -v option
chmod ugo+x
Collapse primary_user modules

Reduces duplicate code.
See Issue #3184
lockdown
fix lint tests
revert bcrypt upgrade
single module
Cleanup and simplification.

* Rename upgrade_verify_primary_user back to verify_primary_user
* Simplify the state machine w.r.t. doUpgradePrimaryUser and upgrade_to_primary
* Simplify verify_primary_user's core logic.
* Rename the #verifyWithPrimary button to .verifyWithPrimary

fixes #3357
Fix new_user KPI for two scenarios:

* FirefoxOS was not reporting new users
* If a user hits cancel from the "set password" screen.

fixes #3359
fixes #3459
count new_users who cancel out in the set_password screen
Code clarification.
Thanks @ozten!
Merge pull request #3458 from mozilla/issue-3184-consolidate-verify-with-primary

Issue 3184 consolidate verify with primary
Improve breathing space of the .tour .button
Not having :active states is not a good practice, I think
Update the tour button active styles to follow the design guide
Update the CONTRIBUTORS doc with Arlo Breault and Mariusz Ciesla
Merge branch 'dev' of https://github.com/mozilla/browserid into dev
Merge pull request #3460 from mozilla/issue_3359_new_account_kpi

Fix new_user KPI for two scenarios

@kparlante gives the r+, I merge. Thanks @kparlante!
Merge branch 'dev' of https://github.com/mozilla/browserid into dev
default ephemeral aws should use kpiggybank-dev