Handle collection+json

Peter Bolingrequested to merge
pboling/205-collection-json into master

Replaces #205

Merge request reports