Issue #127 expand the ValueFormat enumeration

- expanded and rearranged the enumerations before release
Merge pull request #128 from mozilla-services/issue_127

Issue #127 expand the ValueFormat enumeration