Hash settings to prevent overwriting of someone else's changes

Signed-off-by: Jannis Leidel <jannis@leidel.info>
Stop requiring six as a depdendency.

This is possible now that we require at least a version of Django that ships with six.

Signed-off-by: Jannis Leidel <jannis@leidel.info>
Minor cosmetic fix.

Signed-off-by: Jannis Leidel <jannis@leidel.info>