Merge pull request #27 from seantis/master

Adds Python 3 Compatibility
Remove a few things we don't need.
Simplify a test by changing the exception message instead.