updates for recent changes; remove duplication
updates for recent changes; remove duplication

cbagwell/sox,mhartzel/sox_personal_fork,MageSlayer/sox,cbagwell/sox,pcqpcq/sox,jacksonh/sox,MageSlayer/sox,CaptainHayashi/sox,uklauer/sox,pcqpcq/sox,CaptainHayashi/sox,jacksonh/sox,pcqpcq/sox,cbagwell/sox,MageSlayer/sox,Motiejus/sox,MageSlayer/sox,davel/sox,CaptainHayashi/sox,CaptainHayashi/sox,mhartzel/sox_personal_fork,pcqpcq/sox,mhartzel/sox_personal_fork,uklauer/sox,davel/sox,davel/sox,Motiejus/sox,cbagwell/sox,MageSlayer/sox,Distrotech/sox,Distrotech/sox,uklauer/sox,Motiejus/sox,mhartzel/sox_personal_fork,Motiejus/sox,uklauer/sox,Distrotech/sox,Distrotech/sox,davel/sox,jacksonh/sox,jacksonh/sox