Merge "Add .tox to .gitignore"