Merge pull request #12 from jrperritt/7

Implement json.Unmarshaler for Flavor