Support pretty json mode in parser
Implement switch to toggle pretty JSON mode
Change tests to pass them
Add test case for pretty JSON mode
Merge branch 'master' into gh-pages