Merged the jsonOutput and jsonOutputFilename options

Fixes #46