Merge pull request #18 from jrperritt/11

Implement json.Unmarshaler for Server