Merge pull request #48 from teiid/master

Update to support version 6.1
Merge pull request #49 from teiid/2.0.x

Merge pull request #48 from teiid/master