Clean up travis matrix