Missing indices.
Merge branch 'master' of github.com:dw/acid

Conflicts:
	demo/cheeseboard/models.py