This book covers a lot of the history of financial markets – covers a lot of the history of finance, from tulip speculation and the East India Trading company, to today’s models.  Updates in the revised edition include CAPM, its rise as a fad, and its decline when studies by (I believe Fama) showed that its predictions didn’t all hold up.  It also covers the Fama-French model.  The part I found most interesting about the discussion is that CAPM concludes that no premium should be paid for non-systematic risk because it can be diversified away.