working changes plus travis tweak to only run master branch