update Makefile
update travis file