Updating setup.py for better packaging - added tox.ini
Fixing some stupid merge conflicts