updating travis and makefile
updating travis and makefile