Small XML enhancements
Renamed `Json` to `JSON`, `Xml` to `XML` and `Yaml` to `YAML` to follow a convention. Fixes #279
Allow json mapping to work with keywords like `end`, `abstract`, etc.