initial add of Travis yml
fix merge conflict