Set h1 title properly on home page

It was being put into the main block, after the regular h1 that was
populated by the page title ("home"); I guess this was to try to avoid
changing the head's title tag, but that uses a different block name so
isn't a concern.
Merge branch 'develop'