Add python3 support via 'six' module
Fixes for python3 support via 'six' module
Fixes for py.test and python3 support via 'six'