Merge pull request #12 from jsma/patch-2

Fixed migrations to use settings for default/choices