Diffraction at the Tevatron and the LHC