Merge branch 'origin/master'
Merge branch 'library_munger'
WWL 2013:
SonosShareList.txt --update to match shares used with BarryLibrary
updateFromMastserWWL.sh --remove junk at end to fix last commit
Merge branch 'hjw_tag_munger/library_munger'
Merge branch 'library_munger'
makeSonosSharedLinks.sh -- add 3Day_EN, tested on dhara-av1-nas
Merge branch 'hjw_tag_munger/library_munger'
Merge pull request #2 from cdmiller/library_munger

Pulling changes from craig's Library munger branch into hjw's branch.