update Makefile
update travis config