Merge "Fix tox to properly run GitLint"