Fix and improve the travis scripts