Fixed migrations to use settings for choices
Merge pull request #7 from jsma/patch-1

Fixed migrations to use settings for choices
Closes #6