Merge Homepageredux into Master

Mozillians shipped so this needs to get merged into master. I can see there are some merge conflicts, so I'll try to resolve those and add a commit to allow this to work.