Bug 1113029 and Bug 1108480 - Add Get Involved email address for son and uk
Fix Bug 1111872 - Firefox screenshot is not centered on /firefox/new/
Merge pull request #2596 from kyoshino/bug-1111872-screenshot-centering

Fix Bug 1111872 - Firefox screenshot is not centered on /firefox/new/
[bug 1108664] Add missing Firefox OS FAQ style sheets
Merge pull request #2599 from alexgibson/bug-1108664-less-import-cleanup

[bug 1108664] Add missing Firefox OS FAQ style sheets
Make Optimizely per-page opt-in. Bug 1107952.

- Update docs to reflect Waffle configuration.
Switch to the new Docker-based Travis CI builds.
Merge pull request #2598 from flodolo/getinvolved_uk_son

Add Get Involved email address for son (Bug 1113029) and uk (Bug 1108480)
[fix bug 1110848] Remove 'Web We Want' promo from whatsnew/firstrun pages
Merge pull request #2588 from alexgibson/bug-1110848-remove-webwewant-promo

[fix bug 1110848] Remove 'Web We Want' promo from whatsnew/firstrun pages
Update legal-dos to latest master.

Changes:

78996df Merge pull request #268 from GeoffPiperMZ/patch-9
d5e8809 Update en-US.md
8442c99 Clarifications
d99a09f Clarify conversation URLs & direct calls
c6ec83e Change to branding term
ad8cfa2 Clarifications to ToS
a87d1aa Clarifications
7e3dc14 more clarifications in response to governance thread
95ae568 Clarifications in response to governance thread
Merge pull request #2585 from jpetto/bug-1107952-optimizely-opt-in

Make Optimizely per-page opt-in. Bug 1107952.
Merge pull request #2594 from pmclanahan/try-travis-docker

Switch to the new Docker-based Travis CI builds.
Merge pull request #2600 from pmclanahan/update-legal-docs

Update legal-dos to latest master.