Update macros, use rt::io, use iterators for Enum and Cmd defs
Merge pull request #13 from bjz/fix-generator

Fix generator