Merged the jsonOutput and jsonOutputFilename options
Merge pull request #49 from hollandben/feature/combine-jsonOutput-jsonOutputFilename-options

Merged the jsonOutput and jsonOutputFilename options