merge reveal templates into one

there was very fine-grained subclassing in reveal_internals,
which I don't think was beneficial.
reorder slide branch per review
Merge pull request #4795 from minrk/single-reveal-template

merge reveal templates