
Remove some of the redundancy in tox.ini. Fixed some lint issues that weren't caught before due to gaps in the linting coverage. I think that there's more work to be done here, but this does make things better than they were before. Change-Id: I82487dbb9366f3de16b25615bd081b6315671655