WIP: Make kodi handling smarter

Signed-off-by: Brandon McAnsh <brandonm@matricom.net>
Make kodi handling smarter

Signed-off-by: Brandon McAnsh <brandonm@matricom.net>
Merge branch 'kitkat-bmc-wip' into kitkat