Removed some cruft.
Fixed a class name.
Initial support for including pages with template tags.