Pulling in my changes and tests

This contains the latest mat_desc.py script so far and the tests for the two functions it contains with the ".h5m" files and the sample "xsdir" file needed for testing.