Merge "Only print out services if they did something." into pi-dev