Added unit testing to setup.py
Adding tox tests
Adding tox tests
Merge branch 'feature/tox' into develop