Start fixing top_choices
Merge branch 'f-devise-2model' of https://github.com/tuxedio/tuxedo-proto into f-devise-2model