Add tox tests and fixes for Python 2/3 compatibility.
Merge branch 'develop' into feature-all-tests-pass
Merge branch 'feature-all-tests-pass' into develop