Development and test server tweaks.

- Adjust watch to watch .json files.
- Fix dir.html so that it is usable on a dev server, and re-enable it.
- Adjust testdata directories to be allowed (>=3-letter) names.
- Whitespace adjustments.