gitignore
Repaired broken jsons
fixed formatting
Reformatted desc keys
Updated from upstream