Properly handle choice fields

Choice fields for both plots and tree should now convert correctly
Merge pull request #152 from ahinz/fix/choice-fields

Properly handle choice fields