Cleanup the makefile and update .travis.yml.