fix build configuration
update travis config
merge