How do I correctly align the brake disc with the callipers when replacing my quick-release wheel?
Most modern disc brakes (mechanical or hydraulic) can be aligned by loosening the caliper from the frame or fork, grabbing the brake hard, and re-securing the bolts. Then once you let go of the brake, it should be centered. 

Not ideal for the trail, but easy in the garage.