Use the new 'Public' user node
Don't hammer settings.xml
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser.XBMC