Merge pull request #322 from KurtStam/master

DTGOV-85 adding SrampWagon
fixed a couple of problems in the teiid derivers introduced by refactoring in the deriver layer
Merge pull request #323 from EricWittmann/master

Fixed a couple of problems in the teiid derivers
DTGOV-85 fixing project version