Redirect websites directory page for Bug 885797
Also update tabzilla link to the same page and consolote redirects from svn
Merge pull request #2112 from sgarrity/bug-885797-websites-directory

Redirect websites directory page for Bug 885797
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
Fix Bug 1016500 - Implement Manifesto redesign