Bug 925931 - Restore secondary home page templates

Continuing the 80/10/10 split while we work on some further design options before going 100% with the new home page.
Merge pull request #1308 from craigcook/bug-925931-restore-homepage

Bug 925931 - Restore secondary home page templates