update travis and makefile