I've updated Classes and Powers (PDF, Markdown). It now has:

Three classes

* The Swashbuckler, a Martial Striker (disciplines: Blades in the Dark, Rapier's Point)
* The Commander, a Martial Leader (disciplines: Golden Lion, Angel's Trumpet)
* The Mageblade, an Arcane Defender (disciplines: Veiled Moon, Elemental Flux)

Four kits

* Binds Familiar, giving you a familiar companion and access to the Strong Bidding discipline
* Three multiclass kits, for the Swashbuckler, Commander and Mageblade

Seven disciplines

* Blades in the Dark, for tricky and cruel martial powers
* Rapier's Point, for deft dueling martial powers
* Strong Bidding, for arcane powers that work with familiars, summoned monsters and animal companions
* Elemental Flux, for arcane powers that use the five energies of cold, lightning, thunder, acid and fire
* Veiled Moon, for arcane powers that use force energy or teleportation
* Golden Lion, for martial powers involving tactics or teamwork
* Angel's Trumpet, for martial powers involving healing and inspiration

As well as the two prestige paths and one epic path that were previously in the Player Options section.

I think distributing powers based on disciplines, which can be shared between classes or picked up by other means, is a good solution to some of the problems discussed around writing hundreds of powers - but would be interested what others think!