Merging in final commits from odyssey

This branch pulled in the master and resolved conflicts.  See logs.  This branch has been tested using the ED Test Suit (EDTS) which is now bound in the source and added to the repository.

RGK