Will rebellion have all that Entrenchment and Diplomacy have or will they be stripped out?
This is how it is:
Original is vanilla. The structure of everything.
Entrenchment came out, and added to original. Now you can click original OR Entrenchment to play either.
Diplomacy came out, adding on top of Entrenchment. That completes the Trinity set. If you play Diplomacy, it is Original+Entrenchment+Diplomacy. If you selected Entrenchment, it'd only be Original+Entrenchment.
Now Rebellion is standalone. However, it's still an expansion, and it was added on top of Diplomacy. This means playing Rebellion is akin to Original+Entrenchment+Diplomacy+Rebellion. However, buying Rebellion will NOT allow you to play at the lower levels, as in you cannot play JUST Diplomacy and down or JUST Entrenchment and Original. If you buy Rebellion, you are playing Rebellion.
Basically, Rebellion has everything except the ability to go backwards. The expansions are not removed, but cannot be played separately.
EDIT:
It has it all, you just can't play them each separately.
^yea, that.