updating merge issues with radio.js, which will in turn fix travis build.
Merge pull request #276 from vernak2539/fixing_radio_merge_errors_and_travis_build

updating merge issues with radio.js, which will in turn fix travis build and fixing #275