Change password to advanced setting
Merge branch 'pass' of https://github.com/errietta/fxos-irc into errietta-pass
Merge branch 'nickdesaulniers/master'