Update to rust HEAD
Add support for json deserializing enums and options, clean up tests
Initial support for json deserializing enums