Fix bug 1026573 - replace world cup home promo with Firefox desktop

And revert tabzilla back to the Web We Want promo
Merge pull request #2130 from craigcook/bug-1026573-remove-worldcup-promo

Fix bug 1026573 - replace world cup home promo with Firefox desktop