Hack code to pass tests

I've changed some imports and modified a couple of functions to for the
unit tests to pass.
Fix remaining unit tests under Python3
Revert "Hack code to pass tests"

This reverts commit 1274debe5990646a84c610c4f293c256ae8fc840.

Conflicts:
	pytmatrix/orientation.py