makefile, travis changes