Bring codegen up to date
Merge pull request #2 from wycats/rust

Bring codegen up to date