update Makefile and travis config