Merge pull request #2 from oliverzheng/master

Adding descriptor parsing
fix some syntax errors, partially restore python 3.x compatibility (tests still fail)
some tests for Type Tool decoding
Fixing text parsing.

Tests now pass.