First
Merge branch 'master' of https://github.com/kjhurley/xbmclibrarian

Synching between version on crookshanks home/kevin/src/librarian and github