Revert "Fix hyphenated ID decoding"
Merge pull request #63 from mozilla-services/revert-61-bug/decode-hyphenated-id

Revert "Fix hyphenated ID decoding"
Overly complex Generate()