History of Economic Thought by E.K. Hunt. He's got a Marxist bent that he takes out most on Mill and Keynes but is still very thorough and does a good job to contextualize the developments in Economic thought with what was going on politically, economically, and socially at the time.