Improvements to testing and python 3 support

* Moved tests out of package directory
* Added six as a requirement to handle idiosyncrasies between python 2 and 3