Make JSON output content.

This outputs in raw wiki and html.
Also fix the number of tests.
This fixes #14
Update Changes to reflect JSON output changes.