Changed travis to work on master branch
Added more travis configuration