Merge branch 'master' of https://github.com/mozilla/CSOL-site
Merge branch 'master' of https://github.com/mozilla/CSOL-site
Fixing badge type filtering

Resolved #559
Fixing badge type filtering

Resolves #558
Merge branch 'master' of https://github.com/mozilla/CSOL-site
All references to "nickname" changed to "username"
Text changed to suggest printing at password page & bootstrap alert css class
Language consistency ("save" instead of "done")
"Password" changed to "Your Password"
Pencil changed to "Choose your own" at password selection
unnecessary offset removed
Merge pull request #573 from andrewhayward/tweaks

Fixing badge type filtering
Merge pull request #583 from mgballard/master

UX changes based on feedback
This removes autogeneration of passwords for both < and >13
by setting passwordGenerated to false, and copying the >13
password form element stuff into the <13 signup page. If
we're really not going to auto-generate, a follow-up commit
can clean it all out.
Removing "Choose your own" button from password field for <13 signup
if passwordGenerated is true.
Merge pull request #588 from stenington/no-autogenerated-passwords

No autogenerated passwords
updated privacy policy for format fixes #555
updated tos for format fixes #554
Merge pull request #594 from mozilla/updated-tos-privacy

Updated tos privacy
Make fake s3 callbacks receive same num of args as s3 callbacks.

This allows both APIs to be used in async.waterfall() calls.