Fixing the templates for when the challenge is closed and there is no next round
Merge pull request #137 from rossbruniges/dev

Fixing the templates for when the challenge is closed and there is no next round
Merge pull request #138 from mozilla/dev

Merge up dev to stage - fixing the broken homepage