updating merge issues with radio.js, which will in turn fix travis build

fixes #275