tox support
tox support
git ignore tox files
Merge branch 'toxsupport'

Conflicts:
	.gitignore