Unvendor six
Merge pull request #39 from dstufft/unvendor-six

Unvendor six