Moved self test masters around a bit for clarity, Worked on gettting "mvn test" to do the right thing.  Updated doco.