Merge CLI/web validators into main section

Having these separate took up a lot of space and also made things
appear in inconsistent ways.

Just treat them as "languages" (which we do in other sections
anyway), and remove the sorting by language name so we can
keep them at the end.

One web tool was not even a validator so move it to the right section.

Author: handrews

_data/validator-cli.yaml

@@ -76,3 +76,20 @@
       notes:
       draft: [7, 6, 4]
       license: MIT
+- name: Web (Online)
+  implementations:
+    - name: JSON Schema Validator
+      url: https://www.jsonschemavalidator.net/
+    - name: JSON Schema Lint
+      url: http://jsonschemalint.com/
+- name: Command Line
+  implementations:
+    - name: ajv-cli
+      license: MIT
+      url: 'https://www.npmjs.com/package/ajv-cli'
+      draft: [7, 6, 4]
+    - name: Polyglottal JSON Schema Validator
+      license: MIT
+      url: 'https://www.npmjs.com/package/pajv'
+      draft: [6, 4]
+      notes: can be used with YAML and many other formats besides JSON

_data/validator-libraries-modern.yml

@@ -22,19 +22,17 @@ If you have updates to this list, make a pull request on the [GitHub repo](https
 Validators
 ----------
 
-### Libraries
-
 <nav class="intra" markdown="1">
 
-{% assign validator-libraries = site.data.validator-libraries-modern | sort:"name" %}
+{% assign validator-libraries = site.data.validator-libraries-modern %}
 
 {% for language in validator-libraries %}
 -   [{{ language.name }}](#validator-{% if language.anchor-name %}{{ language.anchor-name }}{% else %}{{ language.name | downcase }}{% endif %})
 {% endfor %}
 
 </nav>
 
-<!-- To add a validator library, add it in _data/validator-libraries-modern.yml -->
+<!-- To add a validator, add it in _data/validator-libraries-modern.yml -->
 
 <ul>
   {% for language in validator-libraries %}
@@ -59,22 +57,6 @@ Validators
   {% endfor %}
 </ul>
 
-
-
-### Online
-
--   [JSON Schema Validator](https://www.jsonschemavalidator.net/) - validate against your own schemas
--   [JSON Schema Lint](http://jsonschemalint.com/) - validate against your own schemas
--   [quicktype.io](https://app.quicktype.io/#l=schema) - infer JSON Schema from samples, and generate TypeScript, C++, go, Java, C#, Swift, etc. types from JSON Schema
-
-### Command Line
-
-<!-- To add a validator library, add it in _data/validator-libraries-modern.yml -->
-
-{% for tool in site.data.validator-cli %}
-- [{{ tool.name }}]({{ tool.url }}) <em>[draft-0{{ tool.draft | join: ", draft-0" }}]</em> ({{ tool.license | join: ", " }}){% if tool.notes %}
-  - {{ tool.notes }} {% endif %}{% endfor %}
-
 ### Benchmarks
 
 Benchmarks that compare at least two implementations supporting draft-06+ may be listed here.
@@ -142,6 +124,7 @@ Generators that produce schemas that are compatible with draft-06+ (e.g. no bool
     -   [typescript-json-schema](https://github.com/YousefED/typescript-json-schema)
 -   Online (web tool)
     -   [jsonschema.net](http://www.jsonschema.net) - generates schemas from example data
+    -   [quicktype.io](https://app.quicktype.io/#l=schema) - infer JSON Schema from samples, and generate TypeScript, C++, go, Java, C#, Swift, etc. types from JSON Schema
 
 Data parsing and code generation
 --------------------------------