fix travis.yml and makefile