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

Conflicts:
	pygrade/settings.py