move more stuff into diagrams-travis