Merge pull request #123 from jedws/master

Replace bespoke EncodeJson/DecodeJson instances for collections with derived ones