Got a little carried away with the simpler travis config...