Merge pull request #134 from EricRahm/enum_trait

Split out enum trait generation