Update travis.yml and makefile