Bug 925931 - Restore secondary home page templates

We're continuing the 80/10/10 split while we work on some further design options before going 100% with the new home page.

This restores the relevant files to the state they were in before fbc1b89709 but doesn't rewrite history the way a git revert does.