Merge Soundwall build with current shairport version