Merge pull request #49 from MartyBurns/master

Updates based on TT agreements and mods to espiderived.xsd
Merge remote-tracking branch 'upstream/master'