Not understanding why settings.py was in .gitignore. Grr.
Merge branch 'master' into watcher
Merge branch 'watcher' of github.com:kuperov/pygrade into watcher