Fix tests for Python 3.x

This resolves issue #13 and uses [six](https://pypi.python.org/pypi/six) to achieve this. One test was removed entirely. It could have been resolved but since I want this method to be moved anyway, I'll fix that later.

Note: this PR has code from #16 merged into it for regression testing.