updated travis.yml
merge issues