Fixes Bug 1060289 - implement winning test content
Fixes bug 1060305 - update redirects
Merge pull request #70 from adamlofting/bug1060305

Fixes bug 1060305 - update redirects
Merge pull request #69 from adamlofting/bug1060289

Fixes Bug 1060289 - implement winning test content
Merge pull request #71 from mozilla/master

Deploy bugs 1060289 and 1060305