Parse enum value options
Option maps do not require comma separators
Merge pull request #24 from square/rice/enum_value_options

Parse enum value options and fix option map parsing