Fixed migrations to use settings for default/choices
Merge pull request #22 from jsma/patch-2

Fixed migrations to use settings for default/choices