[travis] Trying it again, fixes and alters serveral files.