Diffraction and Total Cross-Section at the Tevatron and the LHC