Re-simplify (and hopefully speed up) Travis build