tidying up some more things.
Merge branch 'develop' of github.com:TomDudfield/UnoTV into develop