more refactoring, some documentation corrections, and merging in the cucumber testing framework into the new structure.  Needs a bit of work still on abstracting further.