Tidy up makefiles and Travis config.