Update makefile
Update travis config