cleanup schema, use github for schema location
Merge branch 'cleanup-xml-mappings'