Config options cleanup, add boolean type
Merge branch 'master' into config-boolean
Replace SortedDict with OrderedDict (it's being deprecated in Django 1.9)
Make boolean fields a bit more robust to database transitions
Merge branch 'config-boolean'