Sort choices only if order option is set
Remove unneeded fallback value
Merge pull request #21 from jsor/choice-order

Sort choices only if order option is set