Cleanup the Makefile + update travis.yml.