Remove some random file not doing anything
Add boundedBy tag to the default DS template.
Rework the Testing procedures.  Use XML config and not hardcoded crap.

This also means we are in a place to actually test things now!
Yippe.
Clean random stuff
Run the new tests... fix things until they all pass.