Remove 2.6 as a test target.  Fix a test for Python 3.x.
Merge pull request #24 from garnaat/fix-tests

Remove 2.6 as a test target.  Fix a test for Python 3.x.