Addresses #18 making the flattened envelope default
Fixes test for changes in #18
Default to json for html format, issue #19
Default to json for html format, issue #19