Re order properties so that they validate against the XSD
Merge pull request #195 from robertbeal/master

Re order properties so that they validate against the XSD