Updates based on TT agreements and mods to espiderived.xsd

Signed-off-by: Marty Burns <marty@hypertek.us>
Merge remote-tracking branch 'upstream/master'