Fix some stuff
Merge branch 'master' of github.com:HenrikDK/youtube-xbmc-plugin
More collisions