X-Ray Astronomy: The Long and Short