This week in space, NASA and SpaceX hug and make up, all ships will be watched by commercial spy satellites, and we discuss what ongoing repairs to the ISS say about the future of the station.