Final polish for contest submission
Merge https://github.com/bsarsgard/tvclicker