Switch to using six
Merge pull request #20 from dstufft/six

Switch to using six