Simplify Makefile and Travis CI