Adopt to Travis-CI changes, simplify Makefile.