FIX: Remove bonjour code
Tidy up skin/shelf/channel

Add a server list check, to allow a single discovered list (not yet
implmented)
Move settings into the functions
ADD: OnDeck for shelf (selectable in settings)