 The investigators aim to assess if a new blood pressure medication, aliskiren, reduces various biomarkers of heart disease found in the blood in patients with a history of both heart disease and type 2 diabetes. The primary hypothesis is that aliskiren will reduce these biomarkers compared to a calcium channel blocker. 