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
Fixing the final dodgt bit of template code - this for some reason wasn't on dev...
Merge pull request #139 from rossbruniges/stage

Fixing the final dodgt bit of template code - this for some reason wasn't on dev...
Merge pull request #140 from mozilla/stage

Merging up stage to master