Cleanup the makefile + update travis.yml.