Develop pstaab stage2

Removed library*tree.json files from DATA in order to allow merge.  This is a resubmission of stage2 from Peter Staab.