Update LICENSE
Add Python 3 support
Add tox.ini
Merge branch 'master' into local

Conflicts:
	setup.py