Updated for 2.10, with corrections for compilation errors
Includes scalariform hack, requires personal copy of scalariform to
compile
Ignored test for read/write of xml configuration file, the attributes now
appear in a different order. This should be fixed asap.