Replaced bundled code with using six

Fix issue #11 
We shouldn't do this. https://caremad.io/blog/setup-vs-requirement/