Merge newest musicazoo into cmerrill/musicazoo