Update spec (nits and tweaks)
Fixed FIXMEs
Merge branch 'next' of https://github.com/json-schema/json-schema into next