Update *watcher stuff from @kovidgoyal develop branch
Add fixes for flake8 to that stuff
Some fixes for flake8