Merge "Add sample config check to tox pep8 job"